From 1469febff043645cc38e4fe343d2af916bc2c162 Mon Sep 17 00:00:00 2001 From: Zhang Song Date: Thu, 22 Aug 2024 20:49:10 +0800 Subject: [PATCH] crimson/os/seastore: remove laddr_t alignment check Signed-off-by: Zhang Song --- src/crimson/os/seastore/object_data_handler.cc | 9 --------- src/crimson/os/seastore/transaction_manager.h | 4 ---- 2 files changed, 13 deletions(-) diff --git a/src/crimson/os/seastore/object_data_handler.cc b/src/crimson/os/seastore/object_data_handler.cc index 8e6f06b79ee..f27fb0b006f 100644 --- a/src/crimson/os/seastore/object_data_handler.cc +++ b/src/crimson/os/seastore/object_data_handler.cc @@ -520,7 +520,6 @@ ObjectDataHandler::write_ret do_insertions( [ctx](auto ®ion) { LOG_PREFIX(object_data_handler.cc::do_insertions); if (region.is_data()) { - ceph_assert(region.addr.is_aligned(ctx.tm.get_block_size())); assert_aligned(region.len); ceph_assert(region.len == region.bl->length()); DEBUGT("allocating extent: {}~{}", @@ -726,11 +725,6 @@ public: private: // refer to overwrite_plan_t description void validate() const { - ceph_assert(pin_begin.is_aligned(block_size)); - ceph_assert(pin_end.is_aligned(block_size)); - ceph_assert(aligned_data_begin.is_aligned(block_size)); - ceph_assert(aligned_data_end.is_aligned(block_size)); - ceph_assert(pin_begin <= aligned_data_begin); ceph_assert(aligned_data_begin <= data_begin); ceph_assert(data_begin <= data_end); @@ -1208,8 +1202,6 @@ extent_to_write_list_t get_to_writes_with_zero_buffer( (!tailptr && (right == zero_right))); assert(right > left); - assert(left.is_aligned(block_size)); - assert(right.is_aligned(block_size)); // zero region too small for a reserved section, // headptr and tailptr in same extent @@ -1324,7 +1316,6 @@ ObjectDataHandler::write_ret ObjectDataHandler::overwrite( if (headptr) { write_bl.append(*headptr); write_offset = write_offset - headptr->length(); - ceph_assert(write_offset.is_aligned(ctx.tm.get_block_size())); } write_bl.claim_append(*bl); if (tailptr) { diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index b245cf6dcf3..2bd41bb5ab6 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -348,7 +348,6 @@ public: LOG_PREFIX(TransactionManager::alloc_non_data_extent); SUBTRACET(seastore_tm, "{} len={}, placement_hint={}, laddr_hint={}", t, T::TYPE, len, placement_hint, laddr_hint); - ceph_assert(laddr_hint.is_aligned(epm->get_block_size())); auto ext = cache->alloc_new_non_data_extent( t, len, @@ -388,7 +387,6 @@ public: LOG_PREFIX(TransactionManager::alloc_data_extents); SUBTRACET(seastore_tm, "{} len={}, placement_hint={}, laddr_hint={}", t, T::TYPE, len, placement_hint, laddr_hint); - ceph_assert(laddr_hint.is_aligned(epm->get_block_size())); auto exts = cache->alloc_new_data_extents( t, len, @@ -582,7 +580,6 @@ public: extent_len_t len) { LOG_PREFIX(TransactionManager::reserve_region); SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}", t, len, hint); - ceph_assert(hint.is_aligned(epm->get_block_size())); return lba_manager->reserve_region( t, hint, @@ -615,7 +612,6 @@ public: LOG_PREFIX(TransactionManager::clone_pin); SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}, clone_offset {}", t, mapping.get_length(), hint, intermediate_key); - ceph_assert(hint.is_aligned(epm->get_block_size())); return lba_manager->clone_mapping( t, hint, -- 2.39.5