]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::do_osd_ops: consider head whiteout in list-snaps 1719/head
authorSamuel Just <sam.just@inktank.com>
Tue, 22 Apr 2014 23:03:48 +0000 (16:03 -0700)
committerSamuel Just <sam.just@inktank.com>
Wed, 23 Apr 2014 21:11:17 +0000 (14:11 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index 2a4efdc7d3c3421d1e87f726a9b7bb3ba6441b90..5d8419944f901a0dc79d40c99c1248c7910fee3e 100644 (file)
@@ -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;