From 95b0641ad8cfd0358576c6e1a93266fc59ecf710 Mon Sep 17 00:00:00 2001 From: Mark Vitale Date: Thu, 6 Sep 2018 14:09:26 -0400 Subject: [PATCH] volser: combine GCTrans conditional clauses In preparation for a future commit, combine two conditional clauses in GCTrans(). No functional change should be incurred by this commit. Change-Id: Ib08d5b83dd26327124fe0119e6e5f459adc5f78a Reviewed-on: https://gerrit.openafs.org/13303 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- src/volser/voltrans.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/volser/voltrans.c b/src/volser/voltrans.c index 18811b1b15..158fec603c 100644 --- a/src/volser/voltrans.c +++ b/src/volser/voltrans.c @@ -187,9 +187,7 @@ GCTrans(void) ((tt->refCount > 0) ? "is older" : "has been idle for more"), (((now - tt->time) / GCWAKEUP) * GCWAKEUP)); } - if (tt->refCount > 0) - continue; - if (tt->time + OLDTRANSTIME < now) { + if ((tt->refCount <= 0) && (tt->time + OLDTRANSTIME < now)) { Log("trans %u on volume %" AFS_VOLID_FMT " has timed out\n", tt->tid, afs_printable_VolumeId_lu(tt->volid)); tt->refCount++; /* we're using it now */