From: Sage Weil <sage@redhat.com>
Date: Fri, 5 Feb 2016 13:41:03 +0000 (-0500)
Subject: os/bluestore/BlueFS: initialize super block_size earlier in mkfs
X-Git-Tag: v10.0.4~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7535%2Fhead;p=ceph.git

os/bluestore/BlueFS: initialize super block_size earlier in mkfs

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index e0c024e03a3..a79af94bcf5 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -166,6 +166,8 @@ int BlueFS::mkfs(uuid_d osd_uuid)
 
   _init_alloc();
 
+  super.version = 1;
+  super.block_size = bdev[0]->get_block_size();
   super.osd_uuid = osd_uuid;
   super.uuid.generate_random();
   dout(1) << __func__ << " uuid " << super.uuid << dendl;
@@ -193,8 +195,6 @@ int BlueFS::mkfs(uuid_d osd_uuid)
   _flush_log();
 
   // write supers
-  super.version = 1;
-  super.block_size = bdev[0]->get_block_size();
   super.log_fnode = log_file->fnode;
   _write_super();
   _flush_bdev();