From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Jun 2016 13:06:52 +0000 (-0400)
Subject: os/bluestore: clean up Cache::trim
X-Git-Tag: v11.0.0~70^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b55255d23e61d3a4e9f498bec0bbe8554cd249d9;p=ceph.git

os/bluestore: clean up Cache::trim

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index d439019cc4c6..01a3e84637ad 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -480,13 +480,11 @@ void BlueStore::Cache::trim(uint64_t onode_max, uint64_t buffer_max)
       }
       dout(20) << __func__ << " rm " << *b << dendl;
       b->space->_rm_buffer(p);
+    } if (i != buffer_lru.begin()) {
+      --i;
+      continue;
     } else {
-      if (i != buffer_lru.begin()) {
-	--i;
-	continue;
-      } else {
-	break;
-      }
+      break;
     }
   }