update ceph source to reef 18.2.1

[ceph.git] / ceph / src / crimson / os / seastore / random_block_manager / nvme_block_device.h

diff --git a/ceph/src/crimson/os/seastore/random_block_manager/nvme_block_device.h b/ceph/src/crimson/os/seastore/random_block_manager/nvme_block_device.h
index 4dc4de533aa479251a05b82e67cb9e5abd28872e..ed8f99be8dc248fc6a8baafd57f713fdc5098c47 100644 (file)
--- a/ceph/src/crimson/os/seastore/random_block_manager/nvme_block_device.h
+++ b/ceph/src/crimson/os/seastore/random_block_manager/nvme_block_device.h
@@ -209,11 +209,7 @@ public:
 
   mount_ret mount() final;
 
-  mkfs_ret mkfs(device_config_t config) final {
-    using crimson::common::get_conf;
-    super.journal_size = get_conf<Option::size_t>("seastore_cbjournal_size");
-    return do_mkfs(config);
-  }
+  mkfs_ret mkfs(device_config_t config) final;
 
   write_ertr::future<> writev(
     uint64_t offset,
@@ -267,6 +263,18 @@ public:
     return device_path;
   }
 
+  seastar::future<> start() final {
+    return shard_devices.start(device_path);
+  }
+
+  seastar::future<> stop() final {
+    return shard_devices.stop();
+  }
+
+  Device& get_sharded_device() final {
+    return shard_devices.local();
+  }
+
   uint64_t get_preffered_write_granularity() const { return write_granularity; }
   uint64_t get_preffered_write_alignment() const { return write_alignment; }
   uint64_t get_atomic_write_unit() const { return atomic_write_unit; }
@@ -346,6 +354,7 @@ private:
 
   bool data_protection_enabled = false;
   std::string device_path;
+  seastar::sharded<NVMeBlockDevice> shard_devices;
 };
 
 }