Merge pull request #17579 from liewegas/wip-kill-snapdirs

osd: kill snapdirs

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PrimaryLogPG.cc
index 616a18067b11793e1aefff431aa34746305d5485,5510a411bac2a60458dcf9c51777f5047ca89819..00d129038b8d3caf08e4979aa3d9cd14995a0b41
--- 1/src/osd/PrimaryLogPG.cc
--- 2/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -7169,10 -7055,11 +7064,11 @@@ void PrimaryLogPG::make_writeable(OpCon
      hobject_t last_clone_oid = soid;
      last_clone_oid.snap = ctx->new_snapset.clone_overlap.rbegin()->first;
      if (is_present_clone(last_clone_oid)) {
-       interval_set<uint64_t> &newest_overlap = ctx->new_snapset.clone_overlap.rbegin()->second;
+       interval_set<uint64_t> &newest_overlap =
+       ctx->new_snapset.clone_overlap.rbegin()->second;
        ctx->modified_ranges.intersection_of(newest_overlap);
        // modified_ranges is still in use by the clone
 -      add_interval_usage(ctx->modified_ranges, ctx->delta_stats);
 +      ctx->delta_stats.num_bytes += ctx->modified_ranges.size();
        newest_overlap.subtract(ctx->modified_ranges);
      }
    }

diff --cc src/osd/PrimaryLogPG.h
Simple merge

diff --cc src/osd/ReplicatedBackend.cc
Simple merge

diff --cc src/osd/osd_types.h
Simple merge

diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge