From 50f29bf2b78332150f39b49dc067006b93448a33 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 2 Mar 2021 19:45:44 +0800 Subject: [PATCH] crimson/os: do not capture unused variables Signed-off-by: Kefu Chai --- src/crimson/os/alienstore/alien_store.cc | 2 +- .../seastore/collection_manager/flat_collection_manager.cc | 6 +++--- .../os/seastore/omap_manager/btree/omap_btree_node_impl.cc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/os/alienstore/alien_store.cc b/src/crimson/os/alienstore/alien_store.cc index 31b29d29acb..5bde60f8fdb 100644 --- a/src/crimson/os/alienstore/alien_store.cc +++ b/src/crimson/os/alienstore/alien_store.cc @@ -372,7 +372,7 @@ seastar::future<> AlienStore::do_transaction(CollectionRef ch, auto c = static_cast(ch.get()); return store->queue_transaction(c->collection, std::move(txn)); }); - }).then([this, &done] (int r) { + }).then([&done] (int r) { assert(r == 0); return done.get_future(); }); diff --git a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc index 35ee8b3375a..b6591bbc02a 100644 --- a/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc +++ b/src/crimson/os/seastore/collection_manager/flat_collection_manager.cc @@ -32,7 +32,7 @@ FlatCollectionManager::mkfs(Transaction &t) logger().debug("FlatCollectionManager: {}", __func__); return tm.alloc_extent( t, L_ADDR_MIN, MIN_FLAT_BLOCK_SIZE - ).safe_then([this](auto&& root_extent) { + ).safe_then([](auto&& root_extent) { coll_root_t coll_root = coll_root_t( root_extent->get_laddr(), MIN_FLAT_BLOCK_SIZE @@ -100,14 +100,14 @@ FlatCollectionManager::create(coll_root_t &coll_root, Transaction &t, __builtin_unreachable(); }); }); - } + FlatCollectionManager::list_ret FlatCollectionManager::list(const coll_root_t &coll_root, Transaction &t) { logger().debug("FlatCollectionManager: {}", __func__); return get_coll_root(coll_root, t) - .safe_then([this, &t] (auto extent) { + .safe_then([] (auto extent) { return extent->list(); }); } diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc index 1e94e1bb4f6..e1ad0192602 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc +++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc @@ -218,12 +218,12 @@ OMapInnerNode::list( return omap_load_extent( oc, laddr, get_meta().depth - 1 - ).safe_then([&, max_result_size, oc, this] (auto &&extent) { + ).safe_then([&, max_result_size, oc] (auto &&extent) { return extent->list( oc, start, max_result_size - result.size() - ).safe_then([&, max_result_size, this](auto &&child_ret) mutable { + ).safe_then([&, max_result_size](auto &&child_ret) mutable { auto &[child_complete, child_result] = child_ret; if (result.size() && child_result.size()) { assert(child_result.begin()->first > result.rbegin()->first); -- 2.39.5