crimson/tools: clean alien in store-nbd

Signed-off-by: chunmei-liu <chunmei.liu@intel.com>

diff --git a/src/crimson/tools/store_nbd/block_driver.cc b/src/crimson/tools/store_nbd/block_driver.cc
index c7da8179a81d51d7774128e35a385395e32a8434..10e77a34bc39d19a7b8cfde6f944bfc602711891 100644 (file)
--- a/src/crimson/tools/store_nbd/block_driver.cc
+++ b/src/crimson/tools/store_nbd/block_driver.cc
@@ -6,13 +6,12 @@
 
 #include "tm_driver.h"
 
-BlockDriverRef get_backend(BlockDriver::config_t config,
-                          seastar::alien::instance& alien)
+BlockDriverRef get_backend(BlockDriver::config_t config)
 {
   if (config.type == "transaction_manager") {
     return std::make_unique<TMDriver>(config);
   } else if (config.is_futurized_store()) {
-    return std::make_unique<FSDriver>(config, alien);
+    return std::make_unique<FSDriver>(config);
   } else {
     ceph_assert(0 == "invalid option");
     return BlockDriverRef();

diff --git a/src/crimson/tools/store_nbd/block_driver.h b/src/crimson/tools/store_nbd/block_driver.h
index 7f86d31dd5d8949c8df02113e2a1d0e6eaf6860f..ea3453ef3fd1c52b97cfe576edce0612d5742f3a 100644 (file)
--- a/src/crimson/tools/store_nbd/block_driver.h
+++ b/src/crimson/tools/store_nbd/block_driver.h
@@ -13,10 +13,6 @@
 
 #include "include/buffer.h"
 
-namespace seastar::alien {
-class instance;
-}
-
 /**
  * BlockDriver
  *
@@ -135,5 +131,4 @@ public:
 };
 using BlockDriverRef = std::unique_ptr<BlockDriver>;
 
-BlockDriverRef get_backend(BlockDriver::config_t config,
-                          seastar::alien::instance& alien);
+BlockDriverRef get_backend(BlockDriver::config_t config);

diff --git a/src/crimson/tools/store_nbd/fs_driver.h b/src/crimson/tools/store_nbd/fs_driver.h
index 24abf63baad5d7f5de05ab9384cc36dbe9697c96..800dff47944f96d002771764c7a212c3aa31b50f 100644 (file)
--- a/src/crimson/tools/store_nbd/fs_driver.h
+++ b/src/crimson/tools/store_nbd/fs_driver.h
@@ -6,16 +6,10 @@
 #include "crimson/os/futurized_collection.h"
 #include "crimson/os/futurized_store.h"
 
-namespace seastar::alien {
-class instance;
-}
-
 class FSDriver final : public BlockDriver {
 public:
-  FSDriver(config_t config,
-          seastar::alien::instance& alien)
-  : config(config),
-    alien(alien)
+  FSDriver(config_t config)
+  : config(config)
   {}
   ~FSDriver() final {}
 
@@ -42,7 +36,6 @@ public:
 private:
   size_t size = 0;
   const config_t config;
-  seastar::alien::instance& alien;
   std::unique_ptr<crimson::os::FuturizedStore> fs;
 
   struct pg_analogue_t {

diff --git a/src/crimson/tools/store_nbd/store-nbd.cc b/src/crimson/tools/store_nbd/store-nbd.cc
index 003aee73db3d83ec6d8777b8be1ec1d9848f8c83..0857f0f48decbf2dbf5782242d8d61324e1c4d6d 100644 (file)
--- a/src/crimson/tools/store_nbd/store-nbd.cc
+++ b/src/crimson/tools/store_nbd/store-nbd.cc
@@ -298,7 +298,7 @@ int main(int argc, char** argv)
         crimson::common::sharded_conf().stop().get();
       });
 
-      auto backend = get_backend(backend_config, app.alien());
+      auto backend = get_backend(backend_config);
       NBDHandler nbd(*backend, nbd_config);
       backend->mount().get();
       auto close_backend = seastar::defer([&] {