os/bluestore: get rid off redundant is_null_fm() func

Signed-off-by: Igor Fedotov <igor.fedotov@croit.io>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 013f27aa48b528567a923762fd4151d7172666ca..9696aba2c853d78b656d67c3db12f6da63ca9b8f 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5616,7 +5616,8 @@ int BlueStore::_open_fm(KeyValueDB::Transaction t,
       derr << "SMR device but freelist_type = " << freelist_type << " (not zoned)"
            << dendl;
       return -EINVAL;
-    } else if (!bdev->is_smr() && freelist_type == "zoned") {
+    }
+    if (!bdev->is_smr() && freelist_type == "zoned") {
       derr << "non-SMR device (or SMR support not built-in) but freelist_type = zoned"
           << dendl;
       return -EINVAL;
@@ -15086,11 +15087,6 @@ void BlueStore::_do_write_small(
   return;
 }
 
-bool BlueStore::has_null_fm()
-{
-  return fm->is_null_manager();
-}
-
 bool BlueStore::BigDeferredWriteContext::can_defer(
     BlueStore::extent_map_t::iterator ep,
     uint64_t prefer_deferred_size,

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 9d21112d6d32ff134306aab357fc00cc56e69605..2737b975a21eedddb258de58afa358623908afbe 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -2133,7 +2133,6 @@ public:
     bool apply_defer();
   };
 
-  bool has_null_fm();
   // --------------------------------------------------------
   // members
 private:

diff --git a/src/os/bluestore/FreelistManager.cc b/src/os/bluestore/FreelistManager.cc
index 0c605d59e23659b914b9564a1ac8d9dc6ecc41ec..69866fa40cb5f493a4b365eb027c404e9738ebb6 100644 (file)
--- a/src/os/bluestore/FreelistManager.cc
+++ b/src/os/bluestore/FreelistManager.cc
@@ -19,7 +19,8 @@ FreelistManager *FreelistManager::create(
   ceph_assert(prefix == "B");
   if (type == "bitmap") {
     return new BitmapFreelistManager(cct, "B", "b");
-  } else if (type == "null") {
+  }
+  if (type == "null") {
     // use BitmapFreelistManager with the null option to stop allocations from going to RocksDB
     auto *fm = new BitmapFreelistManager(cct, "B", "b");
     fm->set_null_manager();

diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
index 5c339b9e809305c75086698b94d56fda49946df3..99d257b00189f30f0b47c75928143bb5e3347838 100644 (file)
--- a/src/test/objectstore/store_test.cc
+++ b/src/test/objectstore/store_test.cc
@@ -9022,7 +9022,7 @@ TEST_P(StoreTestSpecificAUSize, BluestoreRepairTest) {
   ASSERT_EQ(bstore->fsck(false), 0);
   ASSERT_EQ(bstore->repair(false), 0);
   bstore->mount();
-  if (!bstore->has_null_fm()) {
+  if (!bstore->has_null_manager()) {
     bstore->inject_leaked(0x30000);
     err_was_injected = true;
   }
@@ -9037,7 +9037,7 @@ TEST_P(StoreTestSpecificAUSize, BluestoreRepairTest) {
   //////////// false free fix ////////////
   cerr << "fix false free pextents" << std::endl;
   bstore->mount();
-  if (!bstore->has_null_fm()) {
+  if (!bstore->has_null_manager()) {
     bstore->inject_false_free(cid, hoid);
     err_was_injected = true;
   }
@@ -9088,7 +9088,7 @@ TEST_P(StoreTestSpecificAUSize, BluestoreRepairTest) {
   bstore->inject_misreference(cid, hoid, cid, hoid_dup, 0);
   bstore->inject_misreference(cid, hoid, cid, hoid_dup, (offs_base * repeats) / 2);
   bstore->inject_misreference(cid, hoid, cid, hoid_dup, offs_base * (repeats -1) );
-  int expected_errors = bstore->has_null_fm() ? 3 : 6;
+  int expected_errors = bstore->has_null_manager() ? 3 : 6;
   bstore->umount();
   ASSERT_EQ(bstore->fsck(false), expected_errors);
   ASSERT_EQ(bstore->repair(false), 0);