]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
os/bluestore: Made read/write_meta bdev aware
authorAdam Kupczyk <akupczyk@ibm.com>
Tue, 13 Feb 2024 12:48:33 +0000 (12:48 +0000)
committerPere Diaz Bou <pere-altea@hotmail.com>
Fri, 23 Aug 2024 09:49:25 +0000 (11:49 +0200)
When bdev is not set, do not even try to operate on label.

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>
(cherry picked from commit fe764c4fd8d96571a91418b0e6d84bd28c082404)

src/os/bluestore/BlueStore.cc

index 0dd05577772023ce9556467964d5d0c28bb656b2..24570965d7902fcbc086bf0f062c2fddd645af8d 100644 (file)
@@ -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);
   }