From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Jun 2016 15:23:27 +0000 (-0400)
Subject: os/bluestore: cache: simplify lru trim
X-Git-Tag: v11.0.0~70^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fda7a08106b14c804a60483f245c31138e7998a1;p=ceph.git

os/bluestore: cache: simplify lru trim

Everything in the LRU is clean.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 08b7dffb22e0..e6a2bc050572 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -482,19 +482,13 @@ void BlueStore::LRUCache::trim(uint64_t onode_max, uint64_t buffer_max)
   }
   while (buffer_size > buffer_max) {
     Buffer *b = &*i;
-    if (b->is_clean()) {
-      auto p = b->space->buffer_map.find(b->offset);
-      if (i != buffer_lru.begin()) {
-	--i;
-      }
-      dout(20) << __func__ << " rm " << *b << dendl;
-      b->space->_rm_buffer(p);
-    } if (i != buffer_lru.begin()) {
+    assert(b->is_clean());
+    auto p = b->space->buffer_map.find(b->offset);
+    if (i != buffer_lru.begin()) {
       --i;
-      continue;
-    } else {
-      break;
     }
+    dout(20) << __func__ << " rm " << *b << dendl;
+    b->space->_rm_buffer(p);
   }
 
   // onodes