osd/PrimaryLogPG: find_object_context: drop snapdir handling

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-09-01 10:16:29 -04:00
parent 881f4be3a6
commit ad955d8064

View File

@ -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;