]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os: remove unnecessary now()
authorKefu Chai <kchai@redhat.com>
Wed, 16 Jun 2021 11:00:00 +0000 (19:00 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 16 Jun 2021 11:09:04 +0000 (19:09 +0800)
the previous continuation in the chain already returns a future, no need
to hook up another now().

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/os/seastore/random_block_manager/nvme_manager.cc

index 883e71321510654eff3ab11b12320a5b4bbfbf43..90736746b1f702dfa619bedcb8f65f28f99fe996 100644 (file)
@@ -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<rbm_metadata_header_t> NVMeManager::read_rbm_header(