From de374721b37fea52f4f7539884841ee9eed6fe4a Mon Sep 17 00:00:00 2001 From: chunmei-liu Date: Wed, 8 Sep 2021 16:22:02 -0700 Subject: [PATCH] crimson/tools: clean alien in store-nbd Signed-off-by: chunmei-liu --- src/crimson/tools/store_nbd/block_driver.cc | 5 ++--- src/crimson/tools/store_nbd/block_driver.h | 7 +------ src/crimson/tools/store_nbd/fs_driver.h | 11 ++--------- src/crimson/tools/store_nbd/store-nbd.cc | 2 +- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/crimson/tools/store_nbd/block_driver.cc b/src/crimson/tools/store_nbd/block_driver.cc index c7da8179a81d5..10e77a34bc39d 100644 --- 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(config); } else if (config.is_futurized_store()) { - return std::make_unique(config, alien); + return std::make_unique(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 7f86d31dd5d89..ea3453ef3fd1c 100644 --- 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; -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 24abf63baad5d..800dff47944f9 100644 --- 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 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 003aee73db3d8..0857f0f48decb 100644 --- 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([&] { -- 2.39.5