From 2e66a657aed1f3b15c1a61d95360219b4c51a242 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 16 Jun 2021 19:00:00 +0800 Subject: [PATCH] crimson/os: remove unnecessary now() the previous continuation in the chain already returns a future, no need to hook up another now(). Signed-off-by: Kefu Chai --- .../os/seastore/random_block_manager/nvme_manager.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc b/src/crimson/os/seastore/random_block_manager/nvme_manager.cc index 883e713215106..90736746b1f70 100644 --- a/src/crimson/os/seastore/random_block_manager/nvme_manager.cc +++ b/src/crimson/os/seastore/random_block_manager/nvme_manager.cc @@ -159,9 +159,7 @@ NVMeManager::mkfs_ertr::future<> NVMeManager::mkfs(mkfs_config_t config) "Invalid error open_device in NVMeManager::mkfs" }).finally([this] { if (device) { - return device->close().then([] { - return mkfs_ertr::now(); - }); + return device->close(); } return mkfs_ertr::now(); }); @@ -544,10 +542,7 @@ NVMeManager::write_ertr::future<> NVMeManager::write_rbm_header() assert(bl.length() < super.block_size); iter.copy(bl.length(), bp.c_str()); - return device->write(super.start, bp - ).safe_then([] { - return write_ertr::now(); - }); + return device->write(super.start, bp); } NVMeManager::read_ertr::future NVMeManager::read_rbm_header( -- 2.39.5