From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Nov 2015 12:01:19 +0000 (-0500)
Subject: Merge branch 'osd-op-create' of git://github.com/majianpeng/ceph
X-Git-Tag: v10.0.1~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28c0f8fe18764fcf47baccbec704bdda446d2696;p=ceph.git

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

Conflicts:
	src/osd/ReplicatedPG.cc

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

28c0f8fe18764fcf47baccbec704bdda446d2696
diff --cc src/osd/ReplicatedPG.cc
index 68832d466c54,cc2c26879bcf..64c77a4850b7
--- a/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();
 +	    }
            }
  	}
        }