From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 15 May 2024 13:46:37 +0000 (+0300)
Subject: Merge pull request #57320 from Matan-B/wip-56028-squid
X-Git-Tag: v19.1.1~376
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d0adf523d34843a5e255f2a3f1a4e3e8484c586c;p=ceph.git

Merge pull request #57320 from Matan-B/wip-56028-squid

squid: crimson/os/seastore: cleanups around lba parent-child pointer

Reviewed-by: Samuel Just <sjust@redhat.com>
---

d0adf523d34843a5e255f2a3f1a4e3e8484c586c
diff --cc src/crimson/os/seastore/transaction_manager.h
index 8b89387c7ddd,9532b6160e99..e4b4707b249c
--- a/src/crimson/os/seastore/transaction_manager.h
+++ b/src/crimson/os/seastore/transaction_manager.h
@@@ -430,10 -431,15 +431,14 @@@ public
        last_offset = remap_offset;
        last_len = remap_len;
      }
-     ceph_assert(total_remap_len < original_len);
+     if (remaps.size() == 1) {
+       assert(total_remap_len < original_len);
+     } else {
+       assert(total_remap_len <= original_len);
+     }
  #endif
  
 -    // FIXME: paddr can be absolute and pending
 -    ceph_assert(pin->get_val().is_absolute());
 +    // The according extent might be stable or pending.
      return cache->get_extent_if_cached(
        t, pin->get_val(), T::TYPE
      ).si_then([this, &t, remaps,