From: Xuehan Xu Date: Thu, 31 Jul 2025 07:04:32 +0000 (+0800) Subject: crimson/os/seastore/lba/btree_lba_manager: remove _decref_intermediate() X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fe714e9f84d33a4ff0c370dcf1f5d17da986d502;p=ceph.git crimson/os/seastore/lba/btree_lba_manager: remove _decref_intermediate() Signed-off-by: Xuehan Xu --- diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.cc b/src/crimson/os/seastore/lba/btree_lba_manager.cc index 9a9fc9a813ba..8582da9ea0de 100644 --- a/src/crimson/os/seastore/lba/btree_lba_manager.cc +++ b/src/crimson/os/seastore/lba/btree_lba_manager.cc @@ -1041,50 +1041,6 @@ void BtreeLBAManager::register_metrics() ); } -BtreeLBAManager::_decref_intermediate_ret -BtreeLBAManager::_decref_intermediate( - Transaction &t, - laddr_t addr, - extent_len_t len) -{ - auto c = get_context(t); - return with_btree( - cache, - c, - [c, addr, len](auto &btree) mutable { - return btree.upper_bound_right( - c, addr - ).si_then([&btree, addr, len, c](auto iter) { - ceph_assert(!iter.is_end()); - laddr_t key = iter.get_key(); - ceph_assert(key <= addr); - auto val = iter.get_val(); - ceph_assert(key + val.len >= addr + len); - ceph_assert(val.pladdr.is_paddr()); - ceph_assert(val.refcount >= 1); - val.refcount -= 1; - - LOG_PREFIX(BtreeLBAManager::_decref_intermediate); - TRACET("decreased refcount of intermediate key {} -- {}", - c.trans, key, val); - - if (val.refcount == 0) { - return btree.remove(c, iter - ).si_then([key, val, c](auto iter) { - return ref_iertr::make_ready_future< - update_mapping_ret_bare_t>(key, val, iter.get_cursor(c)); - }); - } else { - return btree.update(c, iter, val - ).si_then([c](auto iter) { - return ref_iertr::make_ready_future< - update_mapping_ret_bare_t>(iter.get_cursor(c)); - }); - } - }); - }); -} - BtreeLBAManager::update_refcount_ret BtreeLBAManager::update_refcount( Transaction &t, diff --git a/src/crimson/os/seastore/lba/btree_lba_manager.h b/src/crimson/os/seastore/lba/btree_lba_manager.h index 2666d5f6c46d..c24d89b73e15 100644 --- a/src/crimson/os/seastore/lba/btree_lba_manager.h +++ b/src/crimson/os/seastore/lba/btree_lba_manager.h @@ -636,13 +636,6 @@ private: return resolve_indirect_cursor(c, btree, indirect_cursor); }); } - - using _decref_intermediate_ret = ref_iertr::future< - update_mapping_ret_bare_t>; - _decref_intermediate_ret _decref_intermediate( - Transaction &t, - laddr_t addr, - extent_len_t len); }; using BtreeLBAManagerRef = std::unique_ptr;