X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FOBSD%2Fosi_machdep.h;h=a969d445daf3ed530c25424368e0c6a6cf9c5d65;hp=9d48b5f8527937d3cdd30bf4454db04b0366bcb4;hb=38136f03cf9043ec98d83653f4fddf5a02e48a2a;hpb=822d725f808d26b177464ef09de7d076e5c7fa36

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 9d48b5f..a969d44 100644
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -16,99 +16,130 @@
  * afs_osi.h.
  */
 
-/* Id: $ */
+/* $Id$ */
 
 #ifndef _OSI_MACHDEP_H_
 #define _OSI_MACHDEP_H_
 
 #include <sys/lock.h>
 
-#define getpid()		curproc
 extern struct simplelock afs_rxglobal_lock;
 
-/* 
- * Time related macros
- */
-extern struct timeval time;
-#define osi_Time() (time.tv_sec)
-#define	afs_hz	    hz
-
 #define M_AFSFID	(M_TEMP-1)
 #define M_AFSBUFHDR	(M_TEMP-2)
 #define M_AFSBUFFER	(M_TEMP-3)
 #define M_AFSGENERIC	(M_TEMP-4)
 
-#define PAGESIZE 8192
+/* vfs */
+#define osi_vfs		mount
+#define osi_vfs_bsize	mnt_stat.f_bsize
+#define osi_vfs_fsid	mnt_stat.f_fsid
+#define vfs_bsize	mnt_stat.f_bsize
+#define vfs_fsid	mnt_stat.f_fsid
+#define vfs_vnodecovered mnt_vnodecovered
+#define v_vfsp		v_mount
 
-#define	AFS_UCRED	ucred
+/* vnode */
+#define SetAfsVnode(vn) /* nothing; done in getnewvnode() */
+#define	IsAfsVnode(vn)	((vn)->v_op == afs_vnodeop_p)
+#define AFS_HOLD(vp)	afs_nbsd_ref(vp)
+#define AFS_RELE(vp)	afs_nbsd_rele(vp)
+#define VN_HOLD(vp)	afs_vget((vp), 0)
+#define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
+#define va_nodeid	va_fileid
+#define vnode_t		struct vnode
+#define vSetType(vc, type)	AFSTOV(vc)->v_type = (type)
+#define vSetVfsp(vc, vfsp)	AFSTOV(vc)->v_mount = (vfsp)
+#define vType(vc)		(vc)->v->v_type
+
+/* uio */
+#define afsio_iov	uio_iov
+#define afsio_iovcnt	uio_iovcnt
+#define afsio_offset	uio_offset
+#define afsio_resid	uio_resid
+#define afsio_seg	uio_segflg
+#define AFS_UIOSYS	UIO_SYSSPACE
+#define AFS_UIOUSER	UIO_USERSPACE
+
+/* malloc */
+#define AFS_KALLOC(s)	afs_nbsd_Alloc(s)
+#define AFS_KFREE(p, s)	afs_nbsd_Free((p), (s))
+
+/* proc, cred */
 #define	AFS_PROC	struct proc
+#define	AFS_UCRED	ucred
+#define afs_suser()	afs_osi_suser(osi_curcred()) 
+#define getpid()	curproc
+#define osi_curcred()	(curproc->p_cred->pc_ucred)
+#define osi_curproc()	curproc
+#define p_rcred         p_ucred
 
-#define afs_bufferpages bufpages
-
-#define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
+/* time */
+extern struct timeval time;
+#define	afs_hz		hz
+#define osi_GetTime(x)	microtime(x)
+#define osi_Time()	(time.tv_sec)
 
-#define afs_suser() afs_osi_suser(osi_curcred()) 
+/* other */
+#define afs_bufferpages bufpages
+#define PAGESIZE	8192
+#define printk		printf	/* for RX version of xdr_* */
+#define setgroups	sys_setgroups
+#define UVM
 
-extern int (**afs_vnodeop_p)();
-#define SetAfsVnode(vn) /* nothing; done in getnewvnode() */
-#define	IsAfsVnode(vn)	    ((vn)->v_op == afs_vnodeop_p)
+/* This is not always in scope yet */
+struct vcache;
 
-#define AFS_HOLD(vp) afs_nbsd_ref(vp)
-#define AFS_RELE(vp) afs_nbsd_rele(vp)
-extern int afs_vget();
+extern int afs_nbsd_lookupname(char *fnamep, enum uio_seg segflg, int followlink,
+			       struct vnode **dirvpp, struct vnode **compvpp);
+extern void afs_nbsd_getnewvnode(struct vcache *tvc);
 extern void afs_nbsd_ref(struct vnode *);
 extern void afs_nbsd_rele(struct vnode *);
+extern void *afs_nbsd_Alloc(size_t asize);
+extern void afs_nbsd_Free(void *p, size_t asize);
+extern int afs_vget();
 
-#define va_nodeid va_fileid
-#define v_vfsp v_mount
-#define vfs_vnodecovered mnt_vnodecovered
-#define vfs_bsize mnt_stat.f_bsize
-typedef void (*osi_timeout_t)(void *);
-#define osi_timeout_t_done
-#define osi_curproc()		(curproc)
-#define osi_curcred()		(curproc->p_cred->pc_ucred)
-#define osi_vfs	mount
-#define osi_vfs_bsize mnt_stat.f_bsize
-#define osi_vfs_fsid mnt_stat.f_fsid
-#define afs_osi_alloc osi_Alloc
-#define afs_osi_free osi_Free
-#define printk printf			/* for RX version of xdr_* */
-#define	vType(vc)		(vc)->v->v_type
-#define vSetType(vc, type)	AFSTOV(vc)->v_type = (type)
-#define	vSetVfsp(vc, vfsp)	AFSTOV(vc)->v_mount = (vfsp)
-#define FTRUNC O_TRUNC
-#define FEXLOCK O_EXLOCK
-#define FSHLOCK O_SHLOCK
-#define UVM
-
-/* no protoytpe 'cuz our includers don't always have uio_rw in scope first */
-extern int afs_nbsd_rdwr();
-extern int afs_nbsd_lookupname();
-extern void afs_nbsd_getnewvnode();
-
-#define VOP_RDWR afs_nbsd_rdwr
 #define	gop_lookupname(fnamep, segflg, followlink, dirvpp, compvpp) \
 	afs_nbsd_lookupname((fnamep), (segflg), (followlink), (dirvpp), (compvpp))
 
 #ifdef KERNEL
-extern struct simplelock afs_global_lock;
+extern int (**afs_vnodeop_p)();
 
-#ifndef AFS_GLOBAL_SUNLOCK
-#define AFS_ASSERT_GLOCK()
-#endif
+#ifdef AFS_GLOBAL_SUNLOCK
+extern struct proc * afs_global_owner;
+extern struct lock afs_global_lock;
+#define AFS_GLOCK() \
+    do { \
+        osi_Assert(curproc); \
+ 	lockmgr(&afs_global_lock, LK_EXCLUSIVE, 0, curproc); \
+        osi_Assert(afs_global_owner == NULL); \
+   	afs_global_owner = curproc; \
+    } while (0)
+#define AFS_GUNLOCK() \
+    do { \
+        osi_Assert(curproc); \
+ 	osi_Assert(afs_global_owner == curproc); \
+        afs_global_owner = NULL; \
+        lockmgr(&afs_global_lock, LK_RELEASE, 0, curproc); \
+    } while(0)
+#define ISAFS_GLOCK() (afs_global_owner == curproc && curproc)
+#else
+extern struct simplelock afs_global_lock;
 #define AFS_GLOCK()
 #define AFS_GUNLOCK()
+#define AFS_ASSERT_GLOCK()
+#define ISAFS_GLOCK() 1
+#endif
 #define AFS_RXGLOCK()
 #define AFS_RXGUNLOCK()
 #define ISAFS_RXGLOCK() 1
-#define ISAFS_GLOCK() 1
 
 #undef SPLVAR
-#define SPLVAR
+#define SPLVAR int splvar
 #undef NETPRI
-#define NETPRI
+#define NETPRI splvar=splnet()
 #undef USERPRI
-#define USERPRI
+#define USERPRI splx(splvar)
 #endif /* KERNEL */
 
 #endif /* _OSI_MACHDEP_H_ */