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

osd/PrimaryLogPG: find_object_context: 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 60b64e3bf97b..9cd58c12bc80 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -9864,15 +9864,10 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid,
 	   << " legacy_snaps " << obc->obs.oi.legacy_snaps
 	   << dendl;
   snapid_t first, last;
-  if (obc->ssc->snapset.is_legacy()) {
-    first = obc->obs.oi.legacy_snaps.back();
-    last = obc->obs.oi.legacy_snaps.front();
-  } else {
-    auto p = obc->ssc->snapset.clone_snaps.find(soid.snap);
-    assert(p != obc->ssc->snapset.clone_snaps.end());
-    first = p->second.back();
-    last = p->second.front();
-  }
+  auto p = obc->ssc->snapset.clone_snaps.find(soid.snap);
+  assert(p != obc->ssc->snapset.clone_snaps.end());
+  first = p->second.back();
+  last = p->second.front();
   if (first <= oid.snap) {
     dout(20) << "find_object_context  " << soid << " [" << first << "," << last
 	     << "] contains " << oid.snap << " -- HIT " << obc->obs << dendl;