From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Sep 2017 17:35:07 +0000 (-0400)
Subject: osd/PrimaryLogPG: start_flush: drop legacy snapset handling
X-Git-Tag: v13.0.1~840^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fca22aae5df6ebf5404aa41fc9eb3903eca89b43;p=ceph.git

osd/PrimaryLogPG: start_flush: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index d4bd1b2434f3..bec17aaac9b2 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -8539,13 +8539,9 @@ int PrimaryLogPG::start_flush(
       snapc.snaps = snapset.snaps;
     } else {
       snapid_t min_included_snap;
-      if (snapset.is_legacy()) {
-	min_included_snap = oi.legacy_snaps.back();
-      } else {
-	auto p = snapset.clone_snaps.find(soid.snap);
-	assert(p != snapset.clone_snaps.end());
-	min_included_snap = p->second.back();
-      }
+      auto p = snapset.clone_snaps.find(soid.snap);
+      assert(p != snapset.clone_snaps.end());
+      min_included_snap = p->second.back();
       snapc = snapset.get_ssc_as_of(min_included_snap - 1);
     }