From: Yingxin Cheng Date: Wed, 19 Mar 2025 02:14:26 +0000 (+0800) Subject: crimson/os/seastore/lba_manager: drop unused get_mappings() X-Git-Tag: testing/wip-vshankar-testing-20250325.080107-debug~4^2~5 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=60369449dfd861031055cc59f5e441dee5c00fe8;p=ceph-ci.git crimson/os/seastore/lba_manager: drop unused get_mappings() Signed-off-by: Yingxin Cheng --- diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h index 26a59f82e92..a4da86f111b 100644 --- a/src/crimson/os/seastore/lba_manager.h +++ b/src/crimson/os/seastore/lba_manager.h @@ -50,17 +50,6 @@ public: Transaction &t, laddr_t offset, extent_len_t length) = 0; - /** - * Fetches mappings for a list of laddr_t in range [offset, offset + len) - * - * Future will not resolve until all pins have resolved (set_paddr called) - * For indirect lba mappings, get_mappings will always retrieve the original - * lba value. - */ - virtual get_mappings_ret get_mappings( - Transaction &t, - laddr_list_t &&extent_lisk) = 0; - /** * Fetches the mapping for laddr_t * diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc index 68008c8b04e..5f4816e6cc4 100644 --- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc +++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.cc @@ -242,31 +242,6 @@ BtreeLBAManager::_get_original_mappings( }); } - -BtreeLBAManager::get_mappings_ret -BtreeLBAManager::get_mappings( - Transaction &t, - laddr_list_t &&list) -{ - LOG_PREFIX(BtreeLBAManager::get_mappings); - TRACET("{}", t, list); - auto l = std::make_unique(std::move(list)); - auto retptr = std::make_unique(); - auto &ret = *retptr; - return trans_intr::do_for_each( - l->begin(), - l->end(), - [this, &t, &ret](const auto &p) { - return this->get_mappings(t, p.first, p.second).si_then( - [&ret](auto res) { - ret.splice(ret.end(), res, res.begin(), res.end()); - return get_mappings_iertr::now(); - }); - }).si_then([l=std::move(l), retptr=std::move(retptr)]() mutable { - return std::move(*retptr); - }); -} - BtreeLBAManager::get_mapping_ret BtreeLBAManager::get_mapping( Transaction &t, diff --git a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h index cdc62a5de33..39cd0d995db 100644 --- a/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h +++ b/src/crimson/os/seastore/lba_manager/btree/btree_lba_manager.h @@ -269,15 +269,10 @@ public: Transaction &t, laddr_t offset, extent_len_t length) final; - get_mappings_ret get_mappings( - Transaction &t, - laddr_list_t &&list) final; - get_mapping_ret get_mapping( Transaction &t, laddr_t offset) final; - struct alloc_mapping_info_t { laddr_t key = L_ADDR_NULL; // once assigned, the allocation to // key must be exact and successful