From e0f19f5f6c192bb317b39736ecc50e43b3814052 Mon Sep 17 00:00:00 2001 From: Zhang Song Date: Thu, 24 Apr 2025 13:57:04 +0800 Subject: [PATCH] crimson/os/seastore: rename type remap_entry to remap_entry_t Signed-off-by: Zhang Song (cherry picked from commit 14afe98f7353c16db5e70ff5b117795d8220e781) --- src/crimson/os/seastore/lba_manager.h | 6 +++--- .../seastore/lba_manager/btree/btree_lba_manager.h | 2 +- src/crimson/os/seastore/object_data_handler.cc | 14 +++++++------- src/crimson/os/seastore/transaction_manager.h | 8 ++++---- .../crimson/seastore/test_object_data_handler.cc | 4 ++-- .../crimson/seastore/test_transaction_manager.cc | 12 ++++++------ 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/crimson/os/seastore/lba_manager.h b/src/crimson/os/seastore/lba_manager.h index 49dae667a903d..fc214e8dad723 100644 --- a/src/crimson/os/seastore/lba_manager.h +++ b/src/crimson/os/seastore/lba_manager.h @@ -118,10 +118,10 @@ public: Transaction &t, laddr_t addr) = 0; - struct remap_entry { + struct remap_entry_t { extent_len_t offset; extent_len_t len; - remap_entry(extent_len_t _offset, extent_len_t _len) { + remap_entry_t(extent_len_t _offset, extent_len_t _len) { offset = _offset; len = _len; } @@ -142,7 +142,7 @@ public: virtual remap_ret remap_mappings( Transaction &t, LBAMappingRef orig_mapping, - std::vector remaps, + std::vector remaps, std::vector extents // Required if and only // if pin isn't indirect ) = 0; 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 83831d45cbb48..e237701e503ab 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 @@ -233,7 +233,7 @@ public: remap_ret remap_mappings( Transaction &t, LBAMappingRef orig_mapping, - std::vector remaps, + std::vector remaps, std::vector extents) final { LOG_PREFIX(BtreeLBAManager::remap_mappings); assert((orig_mapping->is_indirect()) diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc index 47ab0bb223a93..e1ecced2720dd 100644 --- a/src/crimson/os/seastore/object_data_handler.cc +++ b/src/crimson/os/seastore/object_data_handler.cc @@ -131,24 +131,24 @@ struct extent_to_remap_t { return type == type_t::OVERWRITE; } - using remap_entry = TransactionManager::remap_entry; - remap_entry create_remap_entry() { + using remap_entry_t = TransactionManager::remap_entry_t; + remap_entry_t create_remap_entry() { assert(is_remap1()); - return remap_entry( + return remap_entry_t( new_offset, new_len); } - remap_entry create_left_remap_entry() { + remap_entry_t create_left_remap_entry() { assert(is_remap2()); - return remap_entry( + return remap_entry_t( 0, new_offset); } - remap_entry create_right_remap_entry() { + remap_entry_t create_right_remap_entry() { assert(is_remap2()); - return remap_entry( + return remap_entry_t( new_offset + new_len, pin->get_length() - new_offset - new_len); } diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index 4c12a0109aeed..600b04e293d53 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -486,14 +486,14 @@ public: * Remap original extent to new extents. * Return the pins of new extent. */ - using remap_entry = LBAManager::remap_entry; + using remap_entry_t = LBAManager::remap_entry_t; using remap_pin_iertr = base_iertr; using remap_pin_ret = remap_pin_iertr::future>; template remap_pin_ret remap_pin( Transaction &t, LBAMappingRef &&pin, - std::array remaps) { + std::array remaps) { static_assert(std::is_base_of_v); // data extents don't need maybe_init yet, currently, static_assert(is_data_type(T::TYPE)); @@ -502,7 +502,7 @@ public: #ifndef NDEBUG std::sort(remaps.begin(), remaps.end(), - [](remap_entry x, remap_entry y) { + [](remap_entry_t x, remap_entry_t y) { return x.offset < y.offset; }); auto original_len = pin->get_length(); @@ -632,7 +632,7 @@ public: return lba_manager->remap_mappings( t, std::move(pin), - std::vector(remaps.begin(), remaps.end()), + std::vector(remaps.begin(), remaps.end()), std::move(extents) ).si_then([FNAME, &t](auto ret) { SUBDEBUGT(seastore_tm, "remapped {} pins", diff --git a/src/test/crimson/seastore/test_object_data_handler.cc b/src/test/crimson/seastore/test_object_data_handler.cc index 4c4973fac64f6..fe9a003dbdeb0 100644 --- a/src/test/crimson/seastore/test_object_data_handler.cc +++ b/src/test/crimson/seastore/test_object_data_handler.cc @@ -242,7 +242,7 @@ struct object_data_handler_test_t: return ret; } - using remap_entry = TransactionManager::remap_entry; + using remap_entry_t = TransactionManager::remap_entry_t; LBAMappingRef remap_pin( Transaction &t, LBAMappingRef &&opin, @@ -251,7 +251,7 @@ struct object_data_handler_test_t: auto pin = with_trans_intr(t, [&](auto& trans) { return tm->remap_pin( trans, std::move(opin), std::array{ - remap_entry(new_offset, new_len)} + remap_entry_t(new_offset, new_len)} ).si_then([](auto ret) { return std::move(ret[0]); }); diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc index 09cec738900ff..515c924f75b73 100644 --- a/src/test/crimson/seastore/test_transaction_manager.cc +++ b/src/test/crimson/seastore/test_transaction_manager.cc @@ -1097,7 +1097,7 @@ struct transaction_manager_test_t : }); } - using remap_entry = TransactionManager::remap_entry; + using remap_entry_t = TransactionManager::remap_entry_t; LBAMappingRef remap_pin( test_transaction_t &t, LBAMappingRef &&opin, @@ -1114,7 +1114,7 @@ struct transaction_manager_test_t : auto pin = with_trans_intr(*(t.t), [&](auto& trans) { return tm->remap_pin( trans, std::move(opin), std::array{ - remap_entry(new_offset, new_len)} + remap_entry_t(new_offset, new_len)} ).si_then([](auto ret) { return std::move(ret[0]); }); @@ -1166,10 +1166,10 @@ struct transaction_manager_test_t : t, std::move(opin), std::array{ - remap_entry( + remap_entry_t( 0, new_offset), - remap_entry( + remap_entry_t( new_offset + new_len, o_len - new_offset - new_len) } @@ -1205,7 +1205,7 @@ struct transaction_manager_test_t : t, std::move(opin), std::array{ - remap_entry( + remap_entry_t( new_offset + new_len, o_len - new_offset - new_len) } @@ -1236,7 +1236,7 @@ struct transaction_manager_test_t : t, std::move(opin), std::array{ - remap_entry( + remap_entry_t( 0, new_offset) } -- 2.39.5