freebsd vcache splitting fallout

fix the vcache splitting to work again

Change-Id: I8833fc6655dcb79329835664d38f5330645b45f8
Reviewed-on: http://gerrit.openafs.org/1904
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afs/FBSD/osi_vcache.c b/src/afs/FBSD/osi_vcache.c
index f73b9e692e599c995d55bc321882cd6643f1f6f3..5eb79031edc15eb33886a1ea8d979c532340c586 100644 (file)
--- a/src/afs/FBSD/osi_vcache.c
+++ b/src/afs/FBSD/osi_vcache.c
@@ -30,10 +30,10 @@ osi_TryEvictVCache(struct vcache *avc, int *slept) {
        /* vgone() is correct, but v_usecount is assumed not
         * to be 0, and I suspect that currently our usage ensures that
         * in fact it will */
-       if (vrefcnt(AFSTOV(tvc)) < 1) {
-           vref(AFSTOV(tvc));
+       if (vrefcnt(AFSTOV(avc)) < 1) {
+           vref(AFSTOV(avc));
        }
-       vn_lock(AFSTOV(tvc), LK_EXCLUSIVE | LK_RETRY); /* !glocked */
+       vn_lock(AFSTOV(avc), LK_EXCLUSIVE | LK_RETRY); /* !glocked */
 #endif
 
         vgone(AFSTOV(avc));
@@ -97,7 +97,7 @@ osi_AttachVnode(struct vcache *avc, int seq) {
          * mutual exclusion (an Embryonic flag would suffice).
          * -GAW */
        afs_warn("afs_NewVCache: lost the race\n");
-       return (avc);
+       return;
     }
     avc->v = vp;
     avc->v->v_data = avc;

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index b631a3c662d00c58440603b469221fb12e3f473e..9365aa5c3d545ba1133a24d6a3e8f047ecf91fc2 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -865,6 +865,9 @@ afs_NewVCache_int(struct VenusFid *afid, struct server *serverp, int seq)
     VREFCOUNT_SET(tvc, 1);     /* us */
 #endif
 
+#if defined (AFS_FBSD_ENV)
+    if (tvc->f.states & CVInit)
+#endif
     afs_PostPopulateVCache(tvc, afid, seq);
 
     return tvc;