]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
bluestore/BitmapFreelistManager: remove extra if/else judgement
authorHaomai Wang <haomai@xsky.com>
Wed, 21 Sep 2016 03:32:32 +0000 (11:32 +0800)
committerHaomai Wang <haomai@xsky.com>
Wed, 21 Sep 2016 03:32:32 +0000 (11:32 +0800)
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/os/bluestore/BitmapFreelistManager.cc

index ad651b145740324569e988ddd438a1e756774f17..8de18d8f86dfa5e7062b34508dbebf5195d15969 100644 (file)
@@ -521,17 +521,15 @@ void BitmapFreelistManager::_xor(
       first_key += bytes_per_key;
     }
     // middle keys
-    if (first_key < last_key) {
-      while (first_key < last_key) {
-       string k;
-       make_offset_key(first_key, &k);
-       dout(30) << __func__ << " 0x" << std::hex << first_key << std::dec
-                << ": ";
-       all_set_bl.hexdump(*_dout, false);
-       *_dout << dendl;
-       txn->merge(bitmap_prefix, k, all_set_bl);
-       first_key += bytes_per_key;
-      }
+    while (first_key < last_key) {
+      string k;
+      make_offset_key(first_key, &k);
+      dout(30) << __func__ << " 0x" << std::hex << first_key << std::dec
+        << ": ";
+      all_set_bl.hexdump(*_dout, false);
+      *_dout << dendl;
+      txn->merge(bitmap_prefix, k, all_set_bl);
+      first_key += bytes_per_key;
     }
     assert(first_key == last_key);
     {