From 2e50eb38bfeda46bdafeada36140bebe06d29c9c Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 28 Dec 2012 16:36:42 -0500 Subject: [PATCH] afs: Consolidate ShakeLooseVCaches retry init Don't duplicate the initialization code in effectively three separate places. Just goto the top of the loop again. This should incur no functional change; it's just reorganization. Reviewed-on: http://gerrit.openafs.org/8848 Tested-by: BuildBot Reviewed-by: Chas Williams - CONTRACTOR Reviewed-by: Derrick Brashear (cherry picked from commit 36959b50e513d4e9d4d2be93965eec2537943de5) Change-Id: If1277fd4f1cc4adb03695688bcc54ae65715f1a8 Reviewed-on: http://gerrit.openafs.org/8866 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Paul Smeddle Reviewed-by: Stephan Wiesand --- src/afs/afs_vcache.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c index 29f7a4c0c..c1f0d5bc2 100644 --- a/src/afs/afs_vcache.c +++ b/src/afs/afs_vcache.c @@ -663,8 +663,10 @@ afs_ShakeLooseVCaches(afs_int32 anumber) int fv_slept, defersleep = 0; afs_int32 target = anumber; - i = 0; loop = 0; + + retry: + i = 0; for (tq = VLRU.prev; tq != &VLRU && anumber > 0; tq = uq) { tvc = QTOV(tq); uq = QPrev(tq); @@ -685,16 +687,12 @@ afs_ShakeLooseVCaches(afs_int32 anumber) if (fv_slept) { if (loop++ > 100) break; - uq = VLRU.prev; - i = 0; - continue; /* start over - may have raced. */ + goto retry; /* start over - may have raced. */ } if (uq == &VLRU) { if (anumber && !defersleep) { defersleep = 1; - uq = VLRU.prev; - i = 0; - continue; + goto retry; } break; } -- 2.39.5