]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/PrimaryLogPG: find_object_context: drop legacy snapset handling
authorSage Weil <sage@redhat.com>
Fri, 1 Sep 2017 16:38:25 +0000 (12:38 -0400)
committerSage Weil <sage@redhat.com>
Thu, 21 Sep 2017 18:29:33 +0000 (14:29 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PrimaryLogPG.cc

index 60b64e3bf97b4532892198808c5a6e5f213eacd2..9cd58c12bc80d237c000fe4a6dc9f25206cfc2c1 100644 (file)
@@ -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;