From ad955d8064c57ca030bb1168856fbc8279db813f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Sep 2017 10:16:29 -0400 Subject: [PATCH] osd/PrimaryLogPG: find_object_context: drop snapdir handling Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index b9a78e36495..878bd399b9b 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -9743,29 +9743,6 @@ int PrimaryLogPG::find_object_context(const hobject_t& oid, hobject_t head = oid.get_head(); - // want the snapdir? - if (oid.snap == CEPH_SNAPDIR) { - // return head or snapdir, whichever exists. - ObjectContextRef headobc = get_object_context(head, can_create); - ObjectContextRef obc = headobc; - if (!obc || !obc->obs.exists) - obc = get_object_context(oid, can_create); - if (!obc || !obc->obs.exists) { - // if we have neither, we would want to promote the head. - if (pmissing) - *pmissing = head; - if (pobc) - *pobc = headobc; // may be null - return -ENOENT; - } - dout(10) << "find_object_context " << oid - << " @" << oid.snap - << " oi=" << obc->obs.oi - << dendl; - *pobc = obc; - - } - // we want a snap if (!map_snapid_to_clone && pool.info.is_removed_snap(oid.snap)) { dout(10) << __func__ << " snap " << oid.snap << " is removed" << dendl; -- 2.39.5