mirror of
https://git.openafs.org/openafs.git
synced 2025-01-18 06:50:12 +00:00
STABLE14-cleanup-20050424
remaining pullups
This commit is contained in:
parent
1f79fdddda
commit
4c96673ce3
@ -1,4 +1,4 @@
|
||||
The mpp and package included with AFS are obsolete. ntp is no longer included.
|
||||
The ntp, mpp and package included with AFS are obsolete.
|
||||
|
||||
The ntp package is intended to only maintain time on servers; Clients
|
||||
get time from servers unless afsd is started with -nosettime. That said,
|
||||
|
@ -179,6 +179,12 @@ typedef struct uio {
|
||||
/* Get/set the inode in the osifile struct. */
|
||||
#define FILE_INODE(F) (F)->f_dentry->d_inode
|
||||
|
||||
#ifdef AFS_LINUX24_ENV
|
||||
#define OSIFILE_INODE(a) FILE_INODE((a)->filp)
|
||||
#else
|
||||
#define OSIFILE_INODE(a) FILE_INODE(&(a)->file)
|
||||
#endif
|
||||
|
||||
#if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
|
||||
#define NEED_IOCTL32
|
||||
#endif
|
||||
|
@ -40,8 +40,6 @@ extern struct simplelock afs_rxglobal_lock;
|
||||
#define v_vfsp v_mount
|
||||
|
||||
/* vnode */
|
||||
#undef SetAfsVnode
|
||||
#define SetAfsVnode(vn) /* nothing; done in getnewvnode() */
|
||||
#define VN_HOLD(vp) afs_vget((vp), 0)
|
||||
#define VN_RELE(vp) vrele(vp)
|
||||
#define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
|
||||
|
@ -133,16 +133,14 @@ struct afs_osi_WaitHandle {
|
||||
#define vSetVfsp(vc,vfsp) (vc)->v.v_vfsp = (vfsp)
|
||||
#endif
|
||||
|
||||
#ifndef AFS_OBSD_ENV
|
||||
#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
|
||||
#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
|
||||
extern int (**afs_vnodeop_p) ();
|
||||
#define IsAfsVnode(vc) ((vc)->v_op == afs_vnodeop_p)
|
||||
#define SetAfsVnode(vc) /* nothing; done in getnewvnode() */
|
||||
#define IsAfsVnode(v) ((v)->v_op == afs_vnodeop_p)
|
||||
#define SetAfsVnode(v) /* nothing; done in getnewvnode() */
|
||||
#else
|
||||
extern struct vnodeops *afs_ops;
|
||||
#define IsAfsVnode(vc) ((vc)->v_op == afs_ops)
|
||||
#define SetAfsVnode(vc) (vc)->v_op = afs_ops
|
||||
#endif
|
||||
#define IsAfsVnode(v) ((v)->v_op == afs_ops)
|
||||
#define SetAfsVnode(v) (v)->v_op = afs_ops
|
||||
#endif
|
||||
|
||||
#ifdef AFS_SGI65_ENV
|
||||
@ -150,11 +148,9 @@ extern struct vnodeops *afs_ops;
|
||||
lookupname((fnamep),(segflg),(followlink),NULL,(compvpp),\
|
||||
NULL)
|
||||
#else
|
||||
#ifndef AFS_OBSD_ENV
|
||||
#define gop_lookupname(fnamep,segflg,followlink,compvpp) \
|
||||
lookupname((fnamep),(segflg),(followlink),NULL,(compvpp))
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* In IRIX 6.5 we cannot have DEBUG turned on since certain
|
||||
|
Loading…
Reference in New Issue
Block a user