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.

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index be57207..34e5fd0 100644 (file)
--- 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 ef81543..c616365 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -119,7 +119,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
@@ -129,16 +129,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)     (vc)->v_op = afs_vnodeop_p
+#define IsAfsVnode(v)      ((v)->v_op == afs_vnodeop_p)
+#define SetAfsVnode(v)     (v)->v_op = afs_vnodeop_p
 #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
@@ -146,11 +144,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