From 72fe925e93df9b5b26f489e52163e2903168b2d0 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Tue, 2 Jun 2026 06:21:35 +0000 Subject: [PATCH] os/bluestore: Simplify _maybe_unshare_on_remove Unify compressed and uncompressed blobs handling. Signed-off-by: Adam Kupczyk --- src/os/bluestore/BlueStore.cc | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 66846ce8010c..c640ff132c1e 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -18354,24 +18354,13 @@ int BlueStore::_maybe_unshare_on_remove( const Blob* B = e.blob.get(); const bluestore_blob_t& b = B->get_blob(); SharedBlob *sb = B->get_shared_blob().get(); - if (b.is_shared() && - sb->loaded && - maybe_unshared_blobs.count(sb)) { - if (b.is_compressed()) { - b.map(0, b.get_ondisk_size(), [&](uint64_t off, uint64_t len) { - expect[B].get(off, len); - return 0; - }); - // Do not account second time. - maybe_unshared_blobs.erase(sb); - } else { - for (const auto& e: b.get_extents()) { - if (e.is_valid()) { - expect[B].get(e.offset, e.length); - } + if (b.is_shared() && sb->loaded && maybe_unshared_blobs.count(sb)) { + for (const auto& e: b.get_extents()) { + if (e.is_valid()) { + expect[B].get(e.offset, e.length); } - maybe_unshared_blobs.erase(sb); } + maybe_unshared_blobs.erase(sb); } } -- 2.47.3