From 6baffa5b5b9cb007f90f5632e73840fb3d65116d Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 10 Nov 2006 04:35:13 +0000 Subject: [PATCH] STABLE14-revert-inactivevcache-hold-lock-20061109 fails verification. come back to it (cherry picked from commit 1d6da37c594e3f379473aebc2a7345dc41bfff15) --- src/afs/afs_vcache.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 484283f60..92efef11e 100644 --- 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 -- 2.39.5