struct osi_stat {
afs_int32 size; /* file size in bytes */
- afs_int32 blksize; /* optimal transfer size in bytes */
afs_int32 mtime; /* modification date */
afs_int32 atime; /* access time */
};
struct osi_file {
afs_int32 size; /* file size in bytes XXX Must be first field XXX */
-#ifdef AFS_LINUX24_ENV
+#ifdef AFS_LINUX26_ENV
struct file *filp; /* May need this if we really open the file. */
#else
#ifdef AFS_LINUX22_ENV
#endif
int (*proc) (struct osi_file * afile, afs_int32 code); /* proc, which, if not null, is called on writes */
char *rock; /* rock passed to proc */
- ino_t inum; /* guarantee validity of hint */
#if defined(UKERNEL)
int fd; /* file descriptor for user space files */
#endif /* defined(UKERNEL) */
#define osi_GetFileRock(x) ((x)->rock)
#ifdef AFS_TEXT_ENV
-#define osi_FlushText(vp) if (hcmp((vp)->m.DataVersion, (vp)->flushDV) > 0) \
+#define osi_FlushText(vp) if (hcmp((vp)->f.m.DataVersion, (vp)->flushDV) > 0) \
osi_FlushText_really(vp)
#else
#define osi_FlushText(vp)
/*
* Alloc declarations.
*/
+#if !defined(AFS_OBSD44_ENV)
#define afs_osi_Alloc_NoSleep afs_osi_Alloc
+#endif
/*
- * Vnode related macros
+ * Default vnode related macros
+ *
+ * Darwin, all of the BSDs, and Linux have their own
*/
-#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-#define vSetVfsp(vc, vfsp) AFSTOV(vc)->v_mount = (vfsp)
-#define vSetType(vc, type) AFSTOV(vc)->v_type = (type)
-#define vType(vc) AFSTOV(vc)->v_type
-#else
-#define vType(vc) (vc)->v.v_type
-#define vSetType(vc,type) (vc)->v.v_type = (type)
-#define vSetVfsp(vc,vfsp) (vc)->v.v_vfsp = (vfsp)
-#endif
-
-#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-extern int (**afs_vnodeop_p) ();
-#define IsAfsVnode(v) ((v)->v_op == afs_vnodeop_p)
-#define SetAfsVnode(v) /* nothing; done in getnewvnode() */
-#else
+#if !defined(AFS_DARWIN_ENV) && !defined(AFS_XBSD_ENV) && !defined(AFS_LINUX20_ENV)
+# define vType(vc) (vc)->v.v_type
+# define vSetType(vc,type) (vc)->v.v_type = (type)
+# define vSetVfsp(vc,vfsp) (vc)->v.v_vfsp = (vfsp)
extern struct vnodeops *afs_ops;
-#define IsAfsVnode(v) ((v)->v_op == afs_ops)
-#define SetAfsVnode(v) (v)->v_op = afs_ops
-#endif
-
-#ifdef AFS_SGI65_ENV
-#define gop_lookupname(fnamep,segflg,followlink,compvpp) \
- lookupname((fnamep),(segflg),(followlink),NULL,(compvpp),\
- NULL)
-#else
-#define gop_lookupname(fnamep,segflg,followlink,compvpp) \
- lookupname((fnamep),(segflg),(followlink),NULL,(compvpp))
+# define IsAfsVnode(v) ((v)->v_op == afs_ops)
+# define SetAfsVnode(v) (v)->v_op = afs_ops
#endif
/*
* In 64 bit HP-UX the timeval structure has a 64 bit member.
*/
-
-#if defined(AFS_HPUX_ENV) || (defined(AFS_SUN57_ENV) && !defined(AFS_SUN510_ENV)) || defined(AFS_LINUX_64BIT_KERNEL) || (defined(AFS_SGI61_ENV) && defined(KERNEL) && defined(_K64U64))
+#if defined(AFS_HPUX_ENV) || defined(AFS_LINUX_64BIT_KERNEL) || (defined(AFS_SGI61_ENV) && defined(KERNEL) && defined(_K64U64))
typedef struct {
afs_int32 tv_sec;
afs_int32 tv_usec;
} osi_timeval_t;
+#elif defined(AFS_SUN57_ENV)
+typedef struct timeval32 osi_timeval_t;
#else
typedef struct timeval osi_timeval_t;
#endif /* AFS_SGI61_ENV */
+#ifndef UKERNEL
#define osi_getpid() getpid()
+#endif
/*
* osi_ThreadUnique() should yield a value that can be found in ps
#ifdef AFS_FBSD50_ENV
/* should use curthread, but 'ps' can't display it */
#define osi_ThreadUnique() curproc
+#elif defined(AFS_LINUX_ENV)
+#define osi_ThreadUnique() (current->pid)
+#elif defined(UKERNEL)
+#define osi_ThreadUnique() osi_getpid()
#else
#define osi_ThreadUnique() getpid()
#endif
#ifdef AFS_GLOBAL_SUNLOCK
#define AFS_ASSERT_GLOCK() \
- (ISAFS_GLOCK() || (osi_Panic("afs global lock not held at %s:%d\n", __FILE__, __LINE__), 0))
+ do { if (!ISAFS_GLOCK()) osi_Panic("afs global lock not held at %s:%d\n", __FILE__, __LINE__); } while (0)
#endif /* AFS_GLOBAL_SUNLOCK */
#ifdef RX_ENABLE_LOCKS
calling VREF does not */
#define AFS_FAST_HOLD(vp) osi_vnhold((vp),0)
#else
-#define AFS_FAST_HOLD(vp) VN_HOLD(&(vp)->v)
+#define AFS_FAST_HOLD(vp) VN_HOLD(AFSTOV(vp))
#endif
#define AFS_FAST_RELE(vp) AFS_RELE(AFSTOV(vp))
* and kernel space. Call these to avoid taking page faults while
* holding the global lock.
*/
+#if defined(CAST_USER_ADDR_T) && !defined(UKERNEL) && !defined(AFS_DARWIN100_ENV)
+#define __U(X) CAST_USER_ADDR_T((X))
+#else
+#define __U(X) (X)
+#endif
#ifdef AFS_GLOBAL_SUNLOCK
#define AFS_COPYIN(SRC,DST,LEN,CODE) \
int haveGlock = ISAFS_GLOCK(); \
if (haveGlock) \
AFS_GUNLOCK(); \
- CODE = copyin((SRC),(DST),(LEN)); \
+ CODE = copyin(__U((SRC)),(DST),(LEN)); \
if (haveGlock) \
AFS_GLOCK(); \
} while(0)
int haveGlock = ISAFS_GLOCK(); \
if (haveGlock) \
AFS_GUNLOCK(); \
- CODE = copyinstr((SRC),(DST),(LEN),(CNT)); \
+ CODE = copyinstr(__U((SRC)),(DST),(LEN),(CNT)); \
if (haveGlock) \
AFS_GLOCK(); \
} while(0)
int haveGlock = ISAFS_GLOCK(); \
if (haveGlock) \
AFS_GUNLOCK(); \
- CODE = copyout((SRC),(DST),(LEN)); \
+ CODE = copyout((SRC),__U((DST)),(LEN)); \
if (haveGlock) \
AFS_GLOCK(); \
} while(0)
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_DARWIN80_ENV)
+#define AFS_UIOMOVE(SRC,LEN,RW,UIO,CODE) \
+ do { \
+ int haveGlock = ISAFS_GLOCK(); \
+ if (haveGlock) \
+ AFS_GUNLOCK(); \
+ uio_setrw((UIO),(RW)); \
+ CODE = uiomove((SRC),(LEN),(UIO)); \
+ if (haveGlock) \
+ AFS_GLOCK(); \
+ } while(0)
+#else
+#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
#define AFS_UIOMOVE(SRC,LEN,RW,UIO,CODE) \
do { \
int haveGlock = ISAFS_GLOCK(); \
AFS_GLOCK(); \
} while(0)
#endif
+#endif /* AFS_DARWIN80_ENV */
#else /* AFS_GLOBAL_SUNLOCK */
#define AFS_COPYIN(SRC,DST,LEN,CODE) \
do { \
- CODE = copyin((SRC),(DST),(LEN)); \
+ CODE = copyin(__U((SRC)),(DST),(LEN)); \
} while(0)
#define AFS_COPYINSTR(SRC,DST,LEN,CNT,CODE) \
do { \
- CODE = copyinstr((SRC),(DST),(LEN),(CNT)); \
+ CODE = copyinstr(__U((SRC)),(DST),(LEN),(CNT)); \
} while(0)
#define AFS_COPYOUT(SRC,DST,LEN,CODE) \
do { \
- CODE = copyout((SRC),(DST),(LEN)); \
+ CODE = copyout((SRC),__U((DST)),(LEN)); \
} while(0)
-#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_DARWIN80_ENV)
+#define AFS_UIOMOVE(SRC,LEN,RW,UIO,CODE) \
+ do { \
+ uio_setrw((UIO),(RW)); \
+ CODE = uiomove((SRC),(LEN),(UIO)); \
+ } while(0)
+#elif defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
#define AFS_UIOMOVE(SRC,LEN,RW,UIO,CODE) \
do { \
(UIO)->uio_rw = (RW); \
CODE = uiomove((SRC),(LEN),(UIO)); \
} while(0)
-#else /* AFS_OSF_ENV || AFS_FBSD_ENV */
+#else
#define AFS_UIOMOVE(SRC,LEN,RW,UIO,CODE) \
do { \
CODE = uiomove((SRC),(LEN),(RW),(UIO)); \
} while(0)
-#endif /* AFS_OSF_ENV || AFS_FBSD_ENV */
+#endif
#endif /* AFS_GLOBAL_SUNLOCK */
+#ifdef AFS_DARWIN80_ENV
+#define AFS_UIO_OFFSET(uio) uio_offset(uio)
+#define AFS_UIO_RESID(uio) (int)uio_resid(uio)
+#define AFS_UIO_SETOFFSET(uio, off) uio_setoffset(uio, off)
+#define AFS_UIO_SETRESID(uio, val) uio_setresid(uio, val)
+#else
+#define AFS_UIO_OFFSET(uio) (uio)->uio_offset
+#define AFS_UIO_RESID(uio) (uio)->uio_resid
+#define AFS_UIO_SETOFFSET(uio, off) (uio)->uio_offset = off
+#define AFS_UIO_SETRESID(uio, val) (uio)->uio_resid = val
+#endif
+
+
/*
* encapsulation of kernel data structure accesses
*/
+#ifndef UKERNEL
#define setuerror(erval) u.u_error = (erval)
#define getuerror() u.u_error
+#endif
/* Macros for vcache/vnode and vfs arguments to vnode and vfs ops.
* These are required for IRIX 6.4 and later, which pass behavior pointers.
/* Declare any structures which use these macros after the OSI implementation
* has had the opportunity to redefine them.
*/
-extern struct AFS_UCRED afs_osi_cred, *afs_osi_credp;
+extern afs_ucred_t afs_osi_cred, *afs_osi_credp;
#ifndef osi_curcred
#define osi_curcred() (u.u_cred)
git://git.openafs.org / openafs.git / blobdiff