From: Igor Fedotov <ifedotov@suse.com>
Date: Fri, 17 Jun 2022 11:44:38 +0000 (+0300)
Subject: os/bluestore: get rid off redundant close_db_leave_bluefs() method
X-Git-Tag: v18.1.0~896^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56e8bb296f98d0830ea23df3bf84e11285b60a0f;p=ceph.git

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 13832736074..964ce8682c1 100644
--- 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 5d5c1607a81..4c21846ed17 100644
--- 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,