From: Marc Dionne Date: Tue, 11 Jan 2011 02:31:18 +0000 (-0500) Subject: Cache bypass: fix use of incorrect "states" X-Git-Tag: upstream/1.6.0.pre2^2~153 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a26755c9d6739fc9c84bb462fd3a051dea402114;p=packages%2Fo%2Fopenafs.git Cache bypass: fix use of incorrect "states" Test and set the correct field for cache bypass flags. There was some confusion between cachingStates and the states associated with vcache entries in a few places. Reviewed-on: http://gerrit.openafs.org/3637 Reviewed-by: Matt Benjamin Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit 8c541079573274d726180d3d9679c6a26cda84ea) Change-Id: Ibaae9a766ef01cf4c68995c2bef454bae5d03b38 Reviewed-on: http://gerrit.openafs.org/3640 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c index 2e92b413d..18851306d 100644 --- a/src/afs/afs_bypasscache.c +++ b/src/afs/afs_bypasscache.c @@ -159,12 +159,12 @@ afs_TransitionToBypass(struct vcache *avc, * Someone may have beat us to doing the transition - we had no lock * when we checked the flag earlier. No cause to panic, just return. */ - if (avc->f.states & FCSBypass) + if (avc->cachingStates & FCSBypass) goto done; /* If we never cached this, just change state */ if (setDesire && (!(avc->cachingStates & FCSBypass))) { - avc->f.states |= FCSBypass; + avc->cachingStates |= FCSBypass; goto done; } @@ -239,7 +239,7 @@ afs_TransitionToCaching(struct vcache *avc, * Someone may have beat us to doing the transition - we had no lock * when we checked the flag earlier. No cause to panic, just return. */ - if (!(avc->f.states & FCSBypass)) + if (!(avc->cachingStates & FCSBypass)) goto done; /* Ok, we actually do need to flush */