From cec378d94d46f7c622061ee4ab35fa2913712787 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Sep 2017 13:33:09 -0400 Subject: [PATCH] osd/PrimaryLogPG: do_copy_get: drop legacy snapset path Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index f48200a929647..51d8992c45cf8 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -7548,13 +7548,9 @@ int PrimaryLogPG::do_copy_get(OpContext *ctx, bufferlist::iterator& bp, reply_obj.mtime = oi.mtime; assert(obc->ssc); if (soid.snap < CEPH_NOSNAP) { - if (obc->ssc->snapset.is_legacy()) { - reply_obj.snaps = oi.legacy_snaps; - } else { - auto p = obc->ssc->snapset.clone_snaps.find(soid.snap); - assert(p != obc->ssc->snapset.clone_snaps.end()); // warn? - reply_obj.snaps = p->second; - } + auto p = obc->ssc->snapset.clone_snaps.find(soid.snap); + assert(p != obc->ssc->snapset.clone_snaps.end()); // warn? + reply_obj.snaps = p->second; } else { reply_obj.snap_seq = obc->ssc->snapset.seq; } -- 2.39.5