Skip to content

Commit 1469feb

Browse files
committed
crimson/os/seastore: remove laddr_t alignment check
Signed-off-by: Zhang Song <[email protected]>
1 parent f2fc9e7 commit 1469feb

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

src/crimson/os/seastore/object_data_handler.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,6 @@ ObjectDataHandler::write_ret do_insertions(
520520
[ctx](auto &region) {
521521
LOG_PREFIX(object_data_handler.cc::do_insertions);
522522
if (region.is_data()) {
523-
ceph_assert(region.addr.is_aligned(ctx.tm.get_block_size()));
524523
assert_aligned(region.len);
525524
ceph_assert(region.len == region.bl->length());
526525
DEBUGT("allocating extent: {}~{}",
@@ -726,11 +725,6 @@ struct overwrite_plan_t {
726725
private:
727726
// refer to overwrite_plan_t description
728727
void validate() const {
729-
ceph_assert(pin_begin.is_aligned(block_size));
730-
ceph_assert(pin_end.is_aligned(block_size));
731-
ceph_assert(aligned_data_begin.is_aligned(block_size));
732-
ceph_assert(aligned_data_end.is_aligned(block_size));
733-
734728
ceph_assert(pin_begin <= aligned_data_begin);
735729
ceph_assert(aligned_data_begin <= data_begin);
736730
ceph_assert(data_begin <= data_end);
@@ -1208,8 +1202,6 @@ extent_to_write_list_t get_to_writes_with_zero_buffer(
12081202
(!tailptr && (right == zero_right)));
12091203

12101204
assert(right > left);
1211-
assert(left.is_aligned(block_size));
1212-
assert(right.is_aligned(block_size));
12131205

12141206
// zero region too small for a reserved section,
12151207
// headptr and tailptr in same extent
@@ -1324,7 +1316,6 @@ ObjectDataHandler::write_ret ObjectDataHandler::overwrite(
13241316
if (headptr) {
13251317
write_bl.append(*headptr);
13261318
write_offset = write_offset - headptr->length();
1327-
ceph_assert(write_offset.is_aligned(ctx.tm.get_block_size()));
13281319
}
13291320
write_bl.claim_append(*bl);
13301321
if (tailptr) {

src/crimson/os/seastore/transaction_manager.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ class TransactionManager : public ExtentCallbackInterface {
348348
LOG_PREFIX(TransactionManager::alloc_non_data_extent);
349349
SUBTRACET(seastore_tm, "{} len={}, placement_hint={}, laddr_hint={}",
350350
t, T::TYPE, len, placement_hint, laddr_hint);
351-
ceph_assert(laddr_hint.is_aligned(epm->get_block_size()));
352351
auto ext = cache->alloc_new_non_data_extent<T>(
353352
t,
354353
len,
@@ -388,7 +387,6 @@ class TransactionManager : public ExtentCallbackInterface {
388387
LOG_PREFIX(TransactionManager::alloc_data_extents);
389388
SUBTRACET(seastore_tm, "{} len={}, placement_hint={}, laddr_hint={}",
390389
t, T::TYPE, len, placement_hint, laddr_hint);
391-
ceph_assert(laddr_hint.is_aligned(epm->get_block_size()));
392390
auto exts = cache->alloc_new_data_extents<T>(
393391
t,
394392
len,
@@ -582,7 +580,6 @@ class TransactionManager : public ExtentCallbackInterface {
582580
extent_len_t len) {
583581
LOG_PREFIX(TransactionManager::reserve_region);
584582
SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}", t, len, hint);
585-
ceph_assert(hint.is_aligned(epm->get_block_size()));
586583
return lba_manager->reserve_region(
587584
t,
588585
hint,
@@ -615,7 +612,6 @@ class TransactionManager : public ExtentCallbackInterface {
615612
LOG_PREFIX(TransactionManager::clone_pin);
616613
SUBDEBUGT(seastore_tm, "len={}, laddr_hint={}, clone_offset {}",
617614
t, mapping.get_length(), hint, intermediate_key);
618-
ceph_assert(hint.is_aligned(epm->get_block_size()));
619615
return lba_manager->clone_mapping(
620616
t,
621617
hint,

0 commit comments

Comments
 (0)