Merge PR #19277 into master

* refs/pull/19277/head: cephfs: potential adjust failure in lru_expire Reviewed-by: Patrick Donnelly <pdonnell@redhat.com> Reviewed-by: Zheng Yan <zyan@redhat.com>
ceph · Dec 18, 2017 · 62d2e2e · 62d2e2e
2 parents 43b8841 + 590c39e
commit 62d2e2e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/include/lru.h b/src/include/lru.h
@@ -157,14 +157,14 @@ class LRU {
 
   // expire -- expire a single item
   LRUObject *lru_get_next_expire() {
+    adjust();
     // look through tail of bot
     while (bottom.size()) {
       LRUObject *p = bottom.back();
       if (!p->lru_pinned) return p;
 
       // move to pintail
       pintail.push_front(&p->lru_link);
-      adjust();
     }
 
     // ok, try head then
@@ -174,7 +174,6 @@ class LRU {
 
       // move to pintail
       pintail.push_front(&p->lru_link);
-      adjust();
     }
 
     // no luck!