DEVEL15-revert-inactivevcache-hold-lock-20061109

fails verification. come back to it

(cherry picked from commit 1d6da37c594e3f379473aebc2a7345dc41bfff15)

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index 72e40e5a701f1242b0ff0e1533b390c155c38049..2c74d4b576c0e03226186c746eb205f51f4bc720 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -286,7 +286,6 @@ void
 afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred)
 {
     AFS_STATCNT(afs_inactive);
-    ObtainWriteLock(&avc->lock, 50);
     if (avc->states & CDirty) {
        /* we can't keep trying to push back dirty data forever.  Give up. */
        afs_InvalidateAllSegments(avc); /* turns off dirty bit */
@@ -296,16 +295,11 @@ afs_InactiveVCache(struct vcache *avc, struct AFS_UCRED *acred)
     if (avc->states & CUnlinked) {
        if (CheckLock(&afs_xvcache) || CheckLock(&afs_xdcache)) {
            avc->states |= CUnlinkedDel;
-           goto unlock;
+           return;
        }
-       ReleaseWriteLock(&avc->lock);
        afs_remunlink(avc, 1);  /* ignore any return code */
     }
-    return;
 
- unlock:
-    ReleaseWriteLock(&avc->lock);
-    return;
 }
 #endif