From 675d39d1dbfe4714847156c385dd858ac64be1ee Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Tue, 13 Feb 2024 12:48:33 +0000 Subject: [PATCH] os/bluestore: Made read/write_meta bdev aware When bdev is not set, do not even try to operate on label. Signed-off-by: Adam Kupczyk (cherry picked from commit fe764c4fd8d96571a91418b0e6d84bd28c082404) --- src/os/bluestore/BlueStore.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 0dd05577772..24570965d79 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -6006,7 +6006,7 @@ int BlueStore::_set_cache_sizes() int BlueStore::write_meta(const std::string& key, const std::string& value) { - if (bdev && !bdev->supported_bdev_label()) { + if (!bdev || !bdev->supported_bdev_label()) { // skip bdev label section if not supported return ObjectStore::write_meta(key, value); } @@ -6029,7 +6029,7 @@ int BlueStore::write_meta(const std::string& key, const std::string& value) int BlueStore::read_meta(const std::string& key, std::string *value) { - if (bdev && !bdev->supported_bdev_label()) { + if (!bdev || !bdev->supported_bdev_label()) { // skip bdev label section if not supported return ObjectStore::read_meta(key, value); } -- 2.39.5