STABLE12-vol-package-avoid-race-on-invalidating-hashed-vnode-20030111

thanks to whichever of jhutz@cmu.edu or cg2v@andrew.cmu.edu (or both)
noticed the race; also deal with wrap problem in VolumeCacheCheck that i
noticed

diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index bad05c47c65bf97537a848b13b3eaa14808bc461..e9ec600b83caeb7a9a71d9e0edbb73ab7d3c714c 100644 (file)
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -634,7 +634,7 @@ Vnode *VGetVnode_r(ec,vp,vnodeNumber,locktype)
     /* Check that the vnode hasn't been removed while we were obtaining
        the lock */
     VNLog(102, 2, vnodeNumber, (afs_int32) vnp);
-    if (vnp->disk.type == vNull) {
+    if ((vnp->disk.type == vNull) || (vnp->cacheCheck == 0)){
        if (vnp->nUsers-- == 1)
            StickOnLruChain_r(vnp,vcp);
        if (locktype == READ_LOCK)

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 889d9eac95aad1c735e8a5f0f90b549c12273e2d..b150504e478bc40fc6185153ffc22e7f4743d36e 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -699,6 +699,9 @@ private Volume *attach2(ec, path, header, partp, isbusy)
     IH_INIT(vp->linkHandle, partp->device, header->parent,
                   header->linkTable);
     vp->cacheCheck = ++VolumeCacheCheck;
+    /* just in case this ever rolls over */
+    if (!vp->cacheCheck) 
+       vp->cacheCheck = ++VolumeCacheCheck;
     vp->shuttingDown = 0;
     vp->goingOffline = 0;
     vp->nUsers = 1;