From edb1f92a67c5875b6be11621fe1b519c01877e8f Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 4 Jun 2005 15:42:12 +0000 Subject: [PATCH] split-dcache-fixes-20050604 based on discussions with jhutz@cmu.edu and chas@cmf.nrl.navy.mil --- src/afs/afs_dcache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c index a3116d3d2b..b6496abbd2 100644 --- a/src/afs/afs_dcache.c +++ b/src/afs/afs_dcache.c @@ -646,9 +646,9 @@ afs_GetDownD(int anumber, int *aneedSpace, afs_int32 buckethint) if (tvc) { tchunkoffset = AFS_CHUNKTOBASE(tdc->f.chunk); chunkFlags = afs_indexFlags[tdc->index]; - if ((((phase / 2) & 1) == 0) && osi_Active(tvc)) + if (((phase & 1) == 0) && osi_Active(tvc)) skip = 1; - if ((((phase / 2) & 1) == 1) && osi_Active(tvc) + if (((phase & 1) == 1) && osi_Active(tvc) && (tvc->states & CDCLock) && (chunkFlags & IFAnyPages)) skip = 1; @@ -794,7 +794,7 @@ afs_GetDownD(int anumber, int *aneedSpace, afs_int32 buckethint) } } else { /* found no one in phases 0-5, we're hosed */ - if (victimPtr == 0) + if (j == 0) break; } } /* big while loop */