From: Jeffrey Altman Date: Sun, 18 Nov 2012 02:39:50 +0000 (-0500) Subject: Windows: do not adjust deleted scache LRU ordering X-Git-Tag: upstream/1.6.2_pre2^2~28 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c95d1aee53eb5f459e3cfff27bcdd08dbb00095a;p=packages%2Fo%2Fopenafs.git Windows: do not adjust deleted scache LRU ordering Instead of moving deleted scache objects so that they are next in line to be recycled, do not move them at all. Making them next to be recycled results in the CM_SCACHEFLAG_DELETED flag value being lost. Reviewed-on: http://gerrit.openafs.org/8474 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman (cherry picked from commit 887cff5b0f84ad3b758bc4258b1f1302401c2c1d) Change-Id: I7a9377fdd1546f6e555afa4b2f714d8b74b26e87 Reviewed-on: http://gerrit.openafs.org/8648 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index af6c280b3..ed23b6767 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -62,11 +62,8 @@ cm_RootSCachep(cm_user_t *userp, cm_req_t *reqp) void cm_AdjustScacheLRU(cm_scache_t *scp) { lock_AssertWrite(&cm_scacheLock); - osi_QRemoveHT((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q); - if (scp->flags & CM_SCACHEFLAG_DELETED) { - /* Since it has been deleted make it the first to be recycled. */ - osi_QAddT((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q); - } else { + if (!(scp->flags & CM_SCACHEFLAG_DELETED)) { + osi_QRemoveHT((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q); osi_QAddH((osi_queue_t **) &cm_data.scacheLRUFirstp, (osi_queue_t **) &cm_data.scacheLRULastp, &scp->q); } }