From: Igor Fedotov Date: Tue, 26 Apr 2022 11:37:13 +0000 (+0300) Subject: os/bluestore: mark has_null_manager() const X-Git-Tag: v18.1.0~896^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7c2895615108bc0f5819604143d2b3eb9c65475a;p=ceph.git os/bluestore: mark has_null_manager() const Signed-off-by: Igor Fedotov --- diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 44d67c26e88..4c837b84d01 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -289,7 +289,7 @@ public: virtual bool wants_journal() = 0; //< prefers a journal virtual bool allows_journal() = 0; //< allows a journal virtual void prepare_for_fast_shutdown() {} - virtual bool has_null_manager() { return false; } + virtual bool has_null_manager() const { return false; } // return store min allocation size, if applicable virtual uint64_t get_min_alloc_size() const { return 0; diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 9696aba2c85..a8e121b0767 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -7610,7 +7610,7 @@ void BlueStore::set_cache_shards(unsigned num) } //--------------------------------------------- -bool BlueStore::has_null_manager() +bool BlueStore::has_null_manager() const { return (fm && fm->is_null_manager()); } diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 2737b975a21..6c8e30b4c07 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -2798,7 +2798,7 @@ public: bool allows_journal() override { return false; }; void prepare_for_fast_shutdown() override; - virtual bool has_null_manager(); + bool has_null_manager() const override; uint64_t get_min_alloc_size() const override { return min_alloc_size; diff --git a/src/os/bluestore/FreelistManager.h b/src/os/bluestore/FreelistManager.h index 54d27f10804..7f44fe95731 100644 --- a/src/os/bluestore/FreelistManager.h +++ b/src/os/bluestore/FreelistManager.h @@ -56,7 +56,7 @@ public: void set_null_manager() { null_manager = true; } - bool is_null_manager() { + bool is_null_manager() const { return null_manager; } };