From: Jim Rees <rees@umich.edu>
Date: Sun, 24 Apr 2005 21:16:02 +0000 (+0000)
Subject: STABLE14-fix-vc-v-macro-20050420
X-Git-Tag: openafs-devel-1_3_82~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3bdae0f12ad8a389ebea52d77c328817c5404cea;p=packages%2Fo%2Fopenafs.git

STABLE14-fix-vc-v-macro-20050420


Fix IsAfsVnode and friends for OpenBSD and NetBSD.
Use "v" instead of "vc" for vnode args to macros (cosmetic only).
Redefine OpenBSD macros instead of using #ifdefs in afs_osi.h.


(cherry picked from commit 92920f732d8c9b2ca623ede5ffe5a56e98e32624)
---

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index be572072f..34e5fd0ab 100644
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -40,16 +40,13 @@ extern struct simplelock afs_rxglobal_lock;
 #define v_vfsp		v_mount
 
 /* vnode */
+#undef SetAfsVnode
 #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
@@ -108,11 +105,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;
diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 8ebcbd889..a7ccfd848 100644
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -123,7 +123,7 @@ struct afs_osi_WaitHandle {
 /*
  * Vnode related macros
  */
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#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
@@ -137,7 +137,7 @@ struct afs_osi_WaitHandle {
 #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
 extern int (**afs_vnodeop_p) ();
 #define IsAfsVnode(vc)      ((vc)->v_op == afs_vnodeop_p)
-#define SetAfsVnode(vc)     (vc)->v_op = afs_vnodeop_p
+#define SetAfsVnode(vc)     /* nothing; done in getnewvnode() */
 #else
 extern struct vnodeops *afs_ops;
 #define	IsAfsVnode(vc)	    ((vc)->v_op == afs_ops)