From: Derrick Brashear <shadow@dementia.org>
Date: Sun, 5 Jun 2005 16:34:49 +0000 (+0000)
Subject: STABLE14-split-dcache-fixes-20050604
X-Git-Tag: openafs-devel-1_3_84~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=455f752565b45b868944154fe21536d7fafeafce;p=packages%2Fo%2Fopenafs.git

STABLE14-split-dcache-fixes-20050604


based on discussions with jhutz@cmu.edu and chas@cmf.nrl.navy.mil


(cherry picked from commit edb1f92a67c5875b6be11621fe1b519c01877e8f)
---

diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
index a3116d3d2..b6496abbd 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 */