From: Samuel Just <sam.just@inktank.com>
Date: Tue, 22 Apr 2014 23:03:48 +0000 (-0700)
Subject: ReplicatedPG::do_osd_ops: consider head whiteout in list-snaps
X-Git-Tag: v0.80~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83f893489035add3c8504717d80ef48659e7145c;p=ceph.git

ReplicatedPG::do_osd_ops: consider head whiteout in list-snaps

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2a4efdc7d3c3..5d8419944f90 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3537,7 +3537,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 
           resp.clones.push_back(ci);
         }
-        if (ssc->snapset.head_exists) {
+        if (ssc->snapset.head_exists &&
+	    !ctx->obc->obs.oi.is_whiteout()) {
           assert(obs.exists);
           clone_info ci;
           ci.cloneid = CEPH_NOSNAP;