vnrehash-avoid-cachecheck-change-20050618

unlocking and locking lets us race and makes cacheCheck potentially go bad

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index ac922b595abf9b81c990e4af045db8910e20b030..3e4b45df46c3857ae708cbb4513e3e02c30d9993 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -321,6 +321,7 @@ VAllocVnode_r(Error * ec, Volume * vp, VnodeType type)
        return NULL;
     vnodeNumber = bitNumberToVnodeNumber(bitNumber, class);
 
+ vnrehash:
     VNLog(2, 1, vnodeNumber);
     /* Prepare to move it to the new hash chain */
     newHash = VNODE_HASH(vp, vnodeNumber);
@@ -349,6 +350,10 @@ VAllocVnode_r(Error * ec, Volume * vp, VnodeType type)
            VOL_UNLOCK;
            ObtainWriteLock(&vnp->lock);
            VOL_LOCK;
+           if (vnp->volumePtr->cacheCheck != vnp->cacheCheck) {
+               ReleaseWriteLock(&vnp->lock);
+               goto vnrehash;
+           }
        }
 #ifdef AFS_PTHREAD_ENV
        vnp->writer = pthread_self();