From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Jan 2016 16:29:47 +0000 (-0500)
Subject: os/bluestore: reserve first block for label when bluefs = false
X-Git-Tag: v10.0.3~88^2~26
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=323d83dd2070140c65de872f6c099bbbf92bac00;p=ceph.git

os/bluestore: reserve first block for label when bluefs = false

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 86774ba17647..0d9fa24b1e2c 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1600,6 +1600,8 @@ int BlueStore::mkfs()
       ::encode(bluefs_extents, bl);
       t->set(PREFIX_SUPER, "bluefs_extents", bl);
       dout(20) << __func__ << " bluefs_extents " << bluefs_extents << dendl;
+    } else {
+      reserved = BLUEFS_START;
     }
     fm->release(reserved, bdev->get_size() - reserved, t);
     db->submit_transaction_sync(t);
@@ -1836,8 +1838,8 @@ int BlueStore::fsck()
   if (r < 0)
     goto out_alloc;
 
+  used_blocks.insert(0, BLUEFS_START);
   if (bluefs) {
-    used_blocks.insert(0, BLUEFS_START);
     used_blocks.insert(bluefs_extents);
     r = bluefs->fsck();
     if (r < 0)