Merge branch 'osd-op-create' of git://github.com/majianpeng/ceph

Conflicts:
	src/osd/ReplicatedPG.cc

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/osd/ReplicatedPG.cc
index 68832d466c54a09336fda8a879df729710dad7fa,cc2c26879bcf35b7a2428d852fc83e693ef34ea0..64c77a4850b7e0d651c22e1d2798588f0bac715e
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -4940,10 -4764,12 +4940,14 @@@ int ReplicatedPG::do_osd_ops(OpContext 
            // category is no longer implemented.
          }
            if (result >= 0) {
+           bool is_whiteout = obs.exists && oi.is_whiteout();
            if (maybe_create_new_object(ctx)) {
-               ctx->mod_desc.create();
+             ctx->mod_desc.create();
              t->touch(soid);
 -          } else if (is_whiteout) //change whiteout to non-whiteout, it need a op to update xattr.
++          } else if (is_whiteout) {
++            // to change whiteout to non-whiteout, it need an op to update xattr
+             t->nop();
 +          }
            }
        }
        }