fix-vrefcount-20050513

fix VREFCOUNT macro for XBSD

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

and everything else.

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 43a118b6c299445d06931093d87ece89f1928225..3bd3af52096c7d45f8186b9c24989138d4f136ad 100644 (file)
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -63,7 +63,7 @@ extern struct simplelock afs_rxglobal_lock;
 #define        AFS_PROC        struct proc
 #define        AFS_UCRED       ucred
 #define afs_suser(x)   afs_osi_suser(osi_curcred())
-#define getpid()       curproc
+#define getpid()       (curproc->p_pid)
 #define osi_curcred()  (curproc->p_cred->pc_ucred)
 #define osi_curproc()  curproc
 #define p_rcred         p_ucred

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index d78554c8a9b66005f22200e87c98f5546be524e3..a00b80eb26ef32f79e829def88d8cbb5c1a38999 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -377,13 +377,12 @@ afs_remove(OSI_VC_ARG(adp), aname, acred)
        Ttvcr = VREFCOUNT(tvc);
 #endif
 #ifdef AFS_AIX_ENV
-    if (tvc && (VREFCOUNT(tvc) > 2) && tvc->opens > 0
-       && !(tvc->states & CUnlinked))
+    if (tvc && VREFCOUNT_GT(tvc, 2) && tvc->opens > 0
+       && !(tvc->states & CUnlinked)) {
 #else
-    if (tvc && (VREFCOUNT_GT(tvc), 1) && tvc->opens > 0
-       && !(tvc->states & CUnlinked))
+    if (tvc && VREFCOUNT_GT(tvc, 1) && tvc->opens > 0
+       && !(tvc->states & CUnlinked)) {
 #endif
-    {
        char *unlname = afs_newname();
 
        ReleaseWriteLock(&adp->lock);

diff --git a/src/afs/afs.h b/src/afs/afs.h
index b0d8c2dc57a2f05e814c1b35c6b6aa5ab5c4065b..10ddf6003bdb62727da733fd2152a2789b8481a5 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -557,11 +557,11 @@ struct SimpleLocks {
 #define vrefCount   v.v_count
 #endif /* AFS_XBSD_ENV */
 
-/* VREFCOUNT_GT works on vnodes, not vcaches. maybe this is bad? */
 #if defined(AFS_DARWIN80_ENV)
-#define VREFCOUNT_GT(v, y)     vnode_isinuse(AFSTOV(v), y)
+#define VREFCOUNT_GT(v, y)     vnode_isinuse(AFSTOV(v), (y))
 #elif defined(AFS_XBSD_ENV) || defined(AFS_DARWIN_ENV)
-#define VREFCOUNT_GT(v, y)   (AFSTOV(v)->v_usecount>y?1:0)
+#define VREFCOUNT(v)           ((v)->vrefCount)
+#define VREFCOUNT_GT(v, y)     (AFSTOV(v)->v_usecount > (y))
 #elif defined(AFS_LINUX24_ENV)
 #define VREFCOUNT(v)           atomic_read(&((vnode_t *) v)->v_count)
 #define VREFCOUNT_GT(v, y)     ((atomic_read(&((vnode_t *) v)->v_count)>y)?1:0)
@@ -570,7 +570,7 @@ struct SimpleLocks {
 #define VREFCOUNT_INC(v)       atomic_inc(&((vnode_t *) v)->v_count)
 #else
 #define VREFCOUNT(v)           ((v)->vrefCount)
-#define VREFCOUNT_GT(v,y)      ((v).v_count>y?1:0)
+#define VREFCOUNT_GT(v,y)      ((v)->vrefCount > (y))
 #define VREFCOUNT_SET(v, c)    (v)->vrefCount = c;
 #define VREFCOUNT_DEC(v)       (v)->vrefCount--;
 #define VREFCOUNT_INC(v)       (v)->vrefCount++;

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index b2ba0cc45892f4a0cf4a4c6fe96fe7a2ea7fc5ee..ed3919a630594f85b9989a70babfe0ef29424603 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -125,8 +125,7 @@ struct afs_osi_WaitHandle {
  */
 #if defined(AFS_DARWIN80_ENV)
 #define vType(vc)               vnode_vtype(AFSTOV(vc))
-#else
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#elif 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
@@ -141,7 +140,6 @@ extern struct vnodeops *afs_ops;
 #define        IsAfsVnode(v)       ((v)->v_op == afs_ops)
 #define        SetAfsVnode(v)      (v)->v_op = afs_ops
 #endif
-#endif
 
 #ifdef AFS_SGI65_ENV
 #define        gop_lookupname(fnamep,segflg,followlink,compvpp) \