From: Jianpeng Ma Date: Thu, 6 Aug 2015 02:36:42 +0000 (+0800) Subject: osd/ReplicatedPG: using hobject_t::get_snapdir. X-Git-Tag: v9.1.0~72^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=26fee819d0b19aa8451bfad3e37ab87856fd3f08;p=ceph.git osd/ReplicatedPG: using hobject_t::get_snapdir. Signed-off-by: Jianpeng Ma --- diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index b72fff92fff4..891564a89da6 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1555,9 +1555,8 @@ void ReplicatedPG::do_op(OpRequestRef& op) } // missing snapdir? - hobject_t snapdir(m->get_oid(), m->get_object_locator().key, - CEPH_SNAPDIR, m->get_pg().ps(), info.pgid.pool(), - m->get_object_locator().nspace); + hobject_t snapdir = head.get_snapdir(); + if (is_unreadable_object(snapdir)) { wait_for_unreadable_object(snapdir, op); return;