From 8c541079573274d726180d3d9679c6a26cda84ea Mon Sep 17 00:00:00 2001 From: Marc Dionne Date: Mon, 10 Jan 2011 21:31:18 -0500 Subject: [PATCH] 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. Change-Id: Iae957b6f838a44d75776e49662b4aba685800d19 Reviewed-on: http://gerrit.openafs.org/3637 Reviewed-by: Matt Benjamin Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/afs_bypasscache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c index 3cab748a80..4aab3bbe1a 100644 --- a/src/afs/afs_bypasscache.c +++ b/src/afs/afs_bypasscache.c @@ -153,12 +153,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; } @@ -233,7 +233,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 */