ReplicatedPG::do_op: don't return ENOENT for whiteout on snapdir read

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 38fb6ef3bfbca346fad03ba0ee44846177e4c454..2a4efdc7d3c3421d1e87f726a9b7bb3ba6441b90 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1528,8 +1528,11 @@ void ReplicatedPG::do_op(OpRequestRef op)
     reply_ctx(ctx, -ENFILE);
     return;
   }
-  if (!op->may_write() && !op->may_cache() && (!obc->obs.exists ||
-                                              obc->obs.oi.is_whiteout())) {
+  if (!op->may_write() &&
+      !op->may_cache() &&
+      (!obc->obs.exists ||
+       ((m->get_snapid() != CEPH_SNAPDIR) &&
+       obc->obs.oi.is_whiteout()))) {
     reply_ctx(ctx, -ENOENT);
     return;
   }