os/bluestore: get rid off redundant close_db_leave_bluefs() method

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 13832736074fcdb6f05f9f7a910fc48fae6670e7..964ce8682c15007573b9d2a1d90fc90048f59411 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6764,13 +6764,6 @@ int BlueStore::_open_db(bool create, bool to_repair_db, bool read_only)
   return 0;
 }
 
-void BlueStore::_close_db_leave_bluefs()
-{
-  ceph_assert(db);
-  delete db;
-  db = nullptr;
-}
-
 void BlueStore::_close_db()
 {
   dout(10) << __func__ << ":read_only=" << db_was_opened_read_only
@@ -6817,7 +6810,9 @@ void BlueStore::_close_db()
     dout(10) << __func__ << " statfs persisted." << dendl;
     ceph_assert(r >= 0);
   }
-  _close_db_leave_bluefs();
+  ceph_assert(db);
+  delete db;
+  db = nullptr;
 
   if (do_destage && fm && fm->is_null_manager()) {
     int ret = store_allocator(alloc);

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 5d5c1607a81eedb3417f897b84c226127b53cf00..4c21846ed174bf5452d6974d96f22d2d47f7f386 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -2661,7 +2661,6 @@ private:
               bool to_repair_db=false,
               bool read_only = false);
   void _close_db();
-  void _close_db_leave_bluefs();
   int _open_fm(KeyValueDB::Transaction t,
                bool read_only,
                bool db_avail,