obsd-glock-decl-20051115

[openafs.git] / src / afs / OBSD / osi_machdep.h

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 4a45a75..16c9b26 100644 (file)
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -40,16 +40,11 @@ extern struct simplelock afs_rxglobal_lock;
 #define v_vfsp         v_mount
 
 /* vnode */
-#define SetAfsVnode(vn)                /* nothing; done in getnewvnode() */
-#define IsAfsVnode(vn) ((vn)->v_op == afs_vnodeop_p)
 #define VN_HOLD(vp)    afs_vget((vp), 0)
 #define VN_RELE(vp)    vrele(vp)
 #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
@@ -74,7 +69,6 @@ extern struct simplelock afs_rxglobal_lock;
 #define p_rcred         p_ucred
 
 /* time */
-extern struct timeval time;
 #define        afs_hz          hz
 #define osi_GetTime(x) microtime(x)
 #define osi_Time()     (time.tv_sec)
@@ -108,11 +102,11 @@ extern void *afs_nbsd_Alloc(size_t asize);
 extern void afs_nbsd_Free(void *p, size_t asize);
 extern int afs_vget();
 
+#undef gop_lookupname
 #define        gop_lookupname(fnamep, segflg, followlink, compvpp) \
        afs_nbsd_lookupname((fnamep), (segflg), (followlink), (compvpp))
 
 #ifdef KERNEL
-extern int (**afs_vnodeop_p) ();
 
 #ifdef AFS_GLOBAL_SUNLOCK
 extern struct proc *afs_global_owner;
@@ -133,15 +127,12 @@ extern struct lock afs_global_lock;
     } while(0)
 #define ISAFS_GLOCK() (afs_global_owner == curproc && curproc)
 #else
-extern struct simplelock afs_global_lock;
+extern struct lock 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
 
 #undef SPLVAR
 #define SPLVAR int splvar