From: Sage Weil Date: Wed, 7 Aug 2019 15:54:42 +0000 (-0500) Subject: os/bluestore: whitespace X-Git-Tag: v14.2.5~12^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=626d2cbd3a1902f7d5b43f852fb48a6e1424ddfe;p=ceph.git os/bluestore: whitespace Signed-off-by: Sage Weil (cherry picked from commit 99c56559d17fac4fde65ef38a82ac6cab090dafb) --- diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 2ad9f3a7dc4..477efefa9ec 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -4945,8 +4945,9 @@ int BlueStore::_minimal_open_bluefs(bool create) bfn = path + "/block.db"; if (::stat(bfn.c_str(), &st) == 0) { - r = bluefs->add_block_device(BlueFS::BDEV_DB, bfn, - create && cct->_conf->bdev_enable_discard); + r = bluefs->add_block_device( + BlueFS::BDEV_DB, bfn, + create && cct->_conf->bdev_enable_discard); if (r < 0) { derr << __func__ << " add block device(" << bfn << ") returned: " << cpp_strerror(r) << dendl; @@ -5025,7 +5026,7 @@ int BlueStore::_minimal_open_bluefs(bool create) bfn = path + "/block.wal"; if (::stat(bfn.c_str(), &st) == 0) { r = bluefs->add_block_device(BlueFS::BDEV_WAL, bfn, - create && cct->_conf->bdev_enable_discard); + create && cct->_conf->bdev_enable_discard); if (r < 0) { derr << __func__ << " add block device(" << bfn << ") returned: " << cpp_strerror(r) << dendl; @@ -6092,7 +6093,7 @@ int BlueStore::add_new_bluefs_device(int id, const string& dev_path) ceph_assert(r == 0); r = bluefs->add_block_device(BlueFS::BDEV_NEWWAL, p, - cct->_conf->bdev_enable_discard); + cct->_conf->bdev_enable_discard); ceph_assert(r == 0); if (bluefs->bdev_support_label(BlueFS::BDEV_NEWWAL)) { @@ -6113,7 +6114,7 @@ int BlueStore::add_new_bluefs_device(int id, const string& dev_path) ceph_assert(r == 0); r = bluefs->add_block_device(BlueFS::BDEV_NEWDB, p, - cct->_conf->bdev_enable_discard); + cct->_conf->bdev_enable_discard); ceph_assert(r == 0); if (bluefs->bdev_support_label(BlueFS::BDEV_NEWDB)) { @@ -6256,7 +6257,7 @@ int BlueStore::migrate_to_new_bluefs_device(const set& devs_source, target_size = cct->_conf->bluestore_block_wal_size; r = bluefs->add_block_device(BlueFS::BDEV_NEWWAL, dev_path, - cct->_conf->bdev_enable_discard); + cct->_conf->bdev_enable_discard); ceph_assert(r == 0); if (bluefs->bdev_support_label(BlueFS::BDEV_NEWWAL)) { @@ -6273,7 +6274,7 @@ int BlueStore::migrate_to_new_bluefs_device(const set& devs_source, target_size = cct->_conf->bluestore_block_db_size; r = bluefs->add_block_device(BlueFS::BDEV_NEWDB, dev_path, - cct->_conf->bdev_enable_discard); + cct->_conf->bdev_enable_discard); ceph_assert(r == 0); if (bluefs->bdev_support_label(BlueFS::BDEV_NEWDB)) {