summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-10-22 16:30:26 -0700
committerSage Weil <sage@inktank.com>2013-10-22 17:23:43 -0700
commit90e56eb017925ea1ad4f50a0d8eded1eee4319ab (patch)
tree50207994a35dd8bff53df453fdff0cfb18684b06
parentd99f579c01f70a6eb005bde50aaabd38e169838d (diff)
downloadceph-90e56eb017925ea1ad4f50a0d8eded1eee4319ab.tar.gz
osd/ReplicatedPG: ENOENT when deleting a whiteout
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/osd/ReplicatedPG.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 581073e5357..af8a523e5fe 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -3786,7 +3786,7 @@ inline int ReplicatedPG::_delete_head(OpContext *ctx)
const hobject_t& soid = oi.soid;
ObjectStore::Transaction& t = ctx->op_t;
- if (!obs.exists)
+ if (!obs.exists || obs.oi.is_whiteout())
return -ENOENT;
t.remove(coll, soid);