]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #57320 from Matan-B/wip-56028-squid
authorMatan Breizman <mbreizma@redhat.com>
Wed, 15 May 2024 13:46:37 +0000 (16:46 +0300)
committerGitHub <noreply@github.com>
Wed, 15 May 2024 13:46:37 +0000 (16:46 +0300)
squid: crimson/os/seastore: cleanups around lba parent-child pointer

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/os/seastore/cache.h
src/crimson/os/seastore/transaction_manager.h

Simple merge
index 8b89387c7ddd14d7662c2e0d762eb44b9fd8b527,9532b6160e999ebcc524b22195874434103d10fe..e4b4707b249c44e5c173ac45ba30b162e985f700
@@@ -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,