From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 17 Oct 2007 21:34:17 +0000 (+0000)
Subject: DEVEL15-darwin-fsref-other-races-20071017
X-Git-Tag: openafs-devel-1_5_26~20
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2d29a2c758e0a97a1ed281c14a351c3fb3df1f1d;p=packages%2Fo%2Fopenafs.git

DEVEL15-darwin-fsref-other-races-20071017

FIXES 41550

not clear this is exactly correct but testing seems to vet it.


(cherry picked from commit d8faa623f7ae0c26efd9923953f10b80eaed8042)
---

diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index 4b5cc8bbe..e04d02793 100644
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -2069,7 +2069,6 @@ afs_darwin_finalizevnode(struct vcache *avc, struct vnode *dvp, struct component
    ObtainWriteLock(&avc->lock,325);
    ovp = AFSTOV(avc);
    if (!(avc->states & CDeadVnode) && vnode_vtype(ovp) != VNON) {
-        ReleaseWriteLock(&avc->lock);
         AFS_GUNLOCK();
 #if 0 /* unsupported */
         if (dvp && cnp)
@@ -2077,7 +2076,11 @@ afs_darwin_finalizevnode(struct vcache *avc, struct vnode *dvp, struct component
                               cnp->cn_hash,
                               VNODE_UPDATE_PARENT|VNODE_UPDATE_NAME);
 #endif
+	/* Can end up in reclaim... drop GLOCK */
         vnode_rele(ovp);
+	AFS_GLOCK();
+        ReleaseWriteLock(&avc->lock);
+	AFS_GUNLOCK();
         return 0;
    }
    if ((avc->states & CDeadVnode) && vnode_vtype(ovp) != VNON) 
@@ -2099,20 +2102,24 @@ afs_darwin_finalizevnode(struct vcache *avc, struct vnode *dvp, struct component
    error = vnode_create(VNCREATE_FLAVOR, VCREATESIZE, &par, &nvp);
    if (!error) {
        vnode_addfsref(nvp);
+       if ((avc->states & CDeadVnode) && vnode_vtype(ovp) != VNON) 
+	   printf("vcache %p should not be CDeadVnode", avc);
+       if (avc->v == ovp) {
+	   if (!(avc->states & CVInit)) {
+	       vnode_clearfsnode(ovp);
+	       vnode_removefsref(ovp);
+	   }
+       }
        avc->v = nvp;
        avc->states &=~ CDeadVnode;
-       if (!(avc->states & CVInit)) {
-	   vnode_clearfsnode(ovp);
-	   vnode_removefsref(ovp);
-       }
    }
+   vnode_put(ovp);
+   vnode_rele(ovp);
    AFS_GLOCK();
    ReleaseWriteLock(&avc->lock);
    if (!error)
       afs_osi_Wakeup(&avc->states);
    AFS_GUNLOCK();
-   vnode_put(ovp);
-   vnode_rele(ovp);
    return error;
 }
 #endif