From: Xuehan Xu Date: Tue, 31 Oct 2023 12:42:56 +0000 (+0800) Subject: crimson/os/seastore/lba_manager: rename clone_extent to clone_mapping X-Git-Tag: v19.0.0~185^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4010045691ba940a409d2cc78db336fa4a1193a3;p=ceph-ci.git crimson/os/seastore/lba_manager: rename clone_extent to clone_mapping Signed-off-by: Xuehan Xu --- diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h index d7adf2304fb..d4d1826bcf9 100644 --- a/src/crimson/os/seastore/lba_manager.h +++ b/src/crimson/os/seastore/lba_manager.h @@ -89,7 +89,7 @@ public: paddr_t addr, LogicalCachedExtent &nextent) = 0; - virtual alloc_extent_ret clone_extent( + virtual alloc_extent_ret clone_mapping( Transaction &t, laddr_t hint, 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 7895f806abd..79d21b363af 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 @@ -220,7 +220,7 @@ public: nullptr); } - alloc_extent_ret clone_extent( + alloc_extent_ret clone_mapping( Transaction &t, laddr_t hint, extent_len_t len, diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index f30dea3bd77..b708e0a9f20 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -485,12 +485,12 @@ public: } /* - * clone_pin + * clone_mapping * * create an indirect lba mapping pointing to the physical * lba mapping whose key is intermediate_key. Resort to btree_lba_manager.h - * for the definition of "indirect lba mapping" and "physical lba mapping" - * + * for the definition of "indirect lba mapping" and "physical lba mapping". + * Note that the cloned extent must be stable */ using clone_extent_iertr = alloc_extent_iertr; using clone_extent_ret = clone_extent_iertr::future; @@ -507,7 +507,7 @@ public: SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}, clone_offset {}", t, mapping.get_length(), hint, intermediate_key); ceph_assert(is_aligned(hint, epm->get_block_size())); - return lba_manager->clone_extent( + return lba_manager->clone_mapping( t, hint, mapping.get_length(), @@ -887,7 +887,7 @@ private: fut = lba_manager->alloc_extent( t, remap_laddr, remap_length, remap_paddr, *ext); } else { - fut = lba_manager->clone_extent( + fut = lba_manager->clone_mapping( t, remap_laddr, remap_length,