From 95b40849e96b0ad1bde55bbd16b555ba3c839af7 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 22 Jun 2017 10:02:55 +0800 Subject: [PATCH] os/bluestore: drop _open_alloc() from mkfs This is useless as the fsck() process will do necessary validations later. And dropping this can make mkfs slightly faster. Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 970454f5ce51b..81b64ea6f579a 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5088,27 +5088,23 @@ int BlueStore::mkfs() db->submit_transaction_sync(t); } - r = _open_alloc(); - if (r < 0) - goto out_close_fm; r = write_meta("kv_backend", cct->_conf->bluestore_kvbackend); if (r < 0) - goto out_close_alloc; + goto out_close_fm; + r = write_meta("bluefs", stringify((int)cct->_conf->bluestore_bluefs)); if (r < 0) - goto out_close_alloc; + goto out_close_fm; if (fsid != old_fsid) { r = _write_fsid(); if (r < 0) { derr << __func__ << " error writing fsid: " << cpp_strerror(r) << dendl; - goto out_close_alloc; + goto out_close_fm; } } - out_close_alloc: - _close_alloc(); out_close_fm: _close_fm(); out_close_db: -- 2.39.5