libafs: consistently hold vnode refs

Make all common libafs code call AFS_FAST_HOLD to hold an afs vnode
reference, instead of sometimes calling VN_HOLD(AFSTOV(tvc)) directly.
Make AFS_FAST_HOLD always call osi_vnhold, and have each platform
define osi_vnhold for their platform-specific quirks (as it was doing
before).

This way, if a platform has an osi_vnhold that is special somehow (on
solaris, we bump a VFS refcount if the vnode refcount goes from 0->1),
it will always be called on vnode references.

Change-Id: I7bb2b5ac116c8e86f6c6c0d40f414523870275a3
Reviewed-on: http://gerrit.openafs.org/1987
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/AIX/osi_machdep.h b/src/afs/AIX/osi_machdep.h
index f35e9793664f7c1864c887617124b96b17597649..b91fc308393d2706f5f369e69a6cde95542743d4 100644 (file)
--- a/src/afs/AIX/osi_machdep.h
+++ b/src/afs/AIX/osi_machdep.h
@@ -31,7 +31,7 @@ typedef struct proc afs_proc_t;
 
 #define afs_bufferpages v.v_bufhw
 
-#define osi_vnhold(avc, r) do { (avc)->vrefCount++; } while (0)
+#define osi_vnhold(avc, r) do { VN_HOLD(AFSTOV(avc)); } while (0)
 
 #undef gop_lookupname
 #define        gop_lookupname(fnamep,segflg,followlink,compvpp) \

diff --git a/src/afs/SOLARIS/osi_vfsops.c b/src/afs/SOLARIS/osi_vfsops.c
index d09011175f1b1ff8cad1e9c3cccafa938677c30b..b17d495fe99798a824339a874ce4cbb6accb11ca 100644 (file)
--- a/src/afs/SOLARIS/osi_vfsops.c
+++ b/src/afs/SOLARIS/osi_vfsops.c
@@ -200,7 +200,7 @@ again:
        }
     }
     if (tvp) {
-       VN_HOLD(AFSTOV(tvp));
+       AFS_FAST_HOLD(tvp);
        mutex_enter(&AFSTOV(tvp)->v_lock);
        AFSTOV(tvp)->v_flag |= VROOT;
        mutex_exit(&AFSTOV(tvp)->v_lock);

diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c
index 9f52a37c76d81df653c966c607927926e9efa2c1..cbf96beca862d5b372139c2aeb660f857594c9d1 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_fid.c
+++ b/src/afs/VNOPS/afs_vnop_fid.c
@@ -114,7 +114,7 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
        addr[0] = (long)avc;
 #ifndef AFS_AIX41_ENV
        /* No post processing, so don't hold ref count. */
-       VN_HOLD(AFSTOV(avc));
+       AFS_FAST_HOLD(avc);
 #endif
     }
 #if    defined(AFS_AIX_ENV) || defined(AFS_SUN54_ENV)

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index 4633f5ac1a0a76cba10eb6048b87486a47ddb546..0a45f10b09562a3cd05b0dea5a575e41c29a70bf 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -433,7 +433,7 @@ afs_remunlink(register struct vcache *avc, register int doit)
 #if defined(AFS_DARWIN_ENV) && !defined(AFS_DARWIN80_ENV)
            VREF(AFSTOV(avc));
 #else
-           VN_HOLD(AFSTOV(avc));
+           AFS_FAST_HOLD(avc);
 #endif
 
            /* We'll only try this once. If it fails, just release the vnode.

diff --git a/src/afs/afs.h b/src/afs/afs.h
index de8e774080dbc69f777860cfd6795c1d875e9f6c..ae410b949bcb243aba5c999891039460e08cd4f6 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -1210,7 +1210,7 @@ struct afs_FetchOutput {
        avc->f.states |= CCore; /* causes close to be called later */ \
                                                                       \
        /* The cred and vnode holds will be released in afs_FlushActiveVcaches */  \
-       VN_HOLD(AFSTOV(avc));   /* So it won't disappear */           \
+       AFS_FAST_HOLD(avc);     /* So it won't disappear */           \
        CRKEEP(avc, acred); /* Should use a better place for the creds */ \
     }                                                                         \
     else {                                                                    \

diff --git a/src/afs/afs_callback.c b/src/afs/afs_callback.c
index 674bb867a51896b5c2cfb1f746779857031f8d3f..0cdbc28be2c5fd0a94ed23f0a67e1dd472a6a8ca 100644 (file)
--- a/src/afs/afs_callback.c
+++ b/src/afs/afs_callback.c
@@ -456,7 +456,7 @@ loop1:
                            goto loop1;
                        }
 #if     defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV)  || defined(AFS_HPUX_ENV) || defined(AFS_LINUX20_ENV)
-                       VN_HOLD(AFSTOV(tvc));
+                       AFS_FAST_HOLD(tvc);
 #else
 #ifdef AFS_DARWIN80_ENV
                        if (tvc->f.states & CDeadVnode) {
@@ -551,7 +551,7 @@ loop2:
                        goto loop2;
                    }
 #if     defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV)  || defined(AFS_HPUX_ENV) || defined(AFS_LINUX20_ENV)
-                   VN_HOLD(AFSTOV(tvc));
+                   AFS_FAST_HOLD(tvc);
 #else
 #ifdef AFS_DARWIN80_ENV
                    if (tvc->f.states & CDeadVnode) {

diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c
index 412a1289117251ba41845eabf0179b3e68d90b40..959f4e3204423f0b4fd8081122c44e884a5e9dc1 100644 (file)
--- a/src/afs/afs_daemons.c
+++ b/src/afs/afs_daemons.c
@@ -655,7 +655,7 @@ afs_BQueue(register short aopcode, register struct vcache *avc,
            tb->cred = acred;
            crhold(tb->cred);
            if (avc) {
-               VN_HOLD(AFSTOV(avc));
+               AFS_FAST_HOLD(avc);
            }
            tb->refCount = ause + 1;
            tb->size_parm[0] = asparm0;

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 916a65693ae8b6bc8c55ebca6a6bf56dd4f527dd..784fefe829d33363e254c29a9105c581e8b2a2a8 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -258,15 +258,9 @@ typedef struct timeval osi_timeval_t;
  * (Also, of course, the vnode is assumed to be one of ours.  Can't use this
  * macro for V-file vnodes.)
  */
-#if defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
-/* Bare refcount manipulation would probably work on this platform, but just
-   calling VREF does not */
-#define AFS_FAST_HOLD(vp) osi_vnhold((vp),0)
-#elif defined(AFS_AIX_ENV)
-#define AFS_FAST_HOLD(vp) VREFCOUNT_INC(vp)
-#else
-#define AFS_FAST_HOLD(vp) VN_HOLD(AFSTOV(vp))
-#endif
+/* osi_vnhold is defined in PLATFORM/osi_machdep.h */
+#define AFS_FAST_HOLD(vp) osi_vnhold((vp), 0)
+
 #ifdef AFS_AIX_ENV
 #define AFS_FAST_RELE(vp) VREFCOUNT_DEC(vp)
 #else

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index df338d0b45fc96c3a4346b33e13fab8ccb01eaef..76aaaf614822212763fa517a4c34884bf702f82d 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -3437,7 +3437,7 @@ DECL_PIOCTL(PFlushVolumeData)
            }
 #endif
 #if    defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV)  || defined(AFS_HPUX_ENV) || defined(AFS_LINUX20_ENV)
-               VN_HOLD(AFSTOV(tvc));
+               AFS_FAST_HOLD(tvc);
 #elif defined(AFS_DARWIN80_ENV)
                vp = AFSTOV(tvc);
                if (vnode_get(vp))

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index f564d19148ad1c6b9b936e48d85f40008c56857b..ef41442c92e7557b0a92ca789bc9a9149e74bc3c 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -860,7 +860,7 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq)
 
 #if defined(AFS_LINUX22_ENV)
     /* Hold it for the LRU (should make count 2) */
-    VN_HOLD(AFSTOV(tvc));
+    AFS_FAST_HOLD(tvc);
 #elif !(defined (AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV))
     VREFCOUNT_SET(tvc, 1);     /* us */
 #endif