From: Sage Weil <sage@newdream.net>
Date: Fri, 22 Sep 2017 02:25:17 +0000 (-0500)
Subject: Merge pull request #17579 from liewegas/wip-kill-snapdirs
X-Git-Tag: v13.0.1~840
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91b65236c86a71f9c672ef68c5b8dd9fbe3b601a;p=ceph.git

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

osd: kill snapdirs

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

91b65236c86a71f9c672ef68c5b8dd9fbe3b601a
diff --cc src/osd/PrimaryLogPG.cc
index 616a18067b1,5510a411bac..00d129038b8
--- a/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);
      }
    }