From: Xuehan Xu Date: Mon, 20 May 2024 02:45:25 +0000 (+0800) Subject: crimson/os/seastore/lba_manager: hide incref_extent(t, addr, delta) X-Git-Tag: v19.1.1~249^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F58017%2Fhead;p=ceph.git crimson/os/seastore/lba_manager: hide incref_extent(t, addr, delta) Signed-off-by: Xuehan Xu (cherry picked from commit 4b4d04bef29f82d07f667570f758f7993e429dd3) --- diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h index 8ff9406f814bb..a050b2cdf47f7 100644 --- a/src/crimson/os/seastore/lba_manager.h +++ b/src/crimson/os/seastore/lba_manager.h @@ -135,16 +135,6 @@ public: Transaction &t, laddr_t addr) = 0; - /** - * Increments ref count on extent - * - * @return returns resulting refcount - */ - virtual ref_ret incref_extent( - Transaction &t, - laddr_t addr, - int delta) = 0; - struct remap_entry { extent_len_t offset; extent_len_t len; 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 70e6311881272..43807efb5fcf9 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 @@ -350,17 +350,6 @@ public: }); } - ref_ret incref_extent( - Transaction &t, - laddr_t addr, - int delta) final { - ceph_assert(delta > 0); - return update_refcount(t, addr, delta, false - ).si_then([](auto res) { - return std::move(res.ref_update_res); - }); - } - remap_ret remap_mappings( Transaction &t, LBAMappingRef orig_mapping, @@ -451,7 +440,7 @@ public: }).si_then([&remaps, &t, &orig_mapping, this] { if (remaps.size() > 1 && orig_mapping->is_indirect()) { auto intermediate_base = orig_mapping->get_intermediate_base(); - return incref_extent(t, intermediate_base, remaps.size() - 1 + return _incref_extent(t, intermediate_base, remaps.size() - 1 ).si_then([](auto) { return seastar::now(); }); @@ -565,6 +554,17 @@ private: std::vector &alloc_infos, extent_ref_count_t refcount); + ref_ret _incref_extent( + Transaction &t, + laddr_t addr, + int delta) { + ceph_assert(delta > 0); + return update_refcount(t, addr, delta, false + ).si_then([](auto res) { + return std::move(res.ref_update_res); + }); + } + alloc_extent_iertr::future alloc_cloned_mapping( Transaction &t, laddr_t laddr,