From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 14 Sep 2016 07:19:01 +0000 (+0800)
Subject: os/bluestore: drop result check of OP_TRY_RENAME
X-Git-Tag: v11.0.1~245^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16b5487ababb54047d38757f489ed08bd7067070;p=ceph.git

os/bluestore: drop result check of OP_TRY_RENAME

Because _rename() never returns -ENOENT, it only
returns -EEXIST on failure.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index c022e2ee05db..fd5f2c084e53 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -6668,7 +6668,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t)
 
     case Transaction::OP_COLL_MOVE_RENAME:
     case Transaction::OP_TRY_RENAME:
-    {
+      {
 	assert(op->cid == op->dest_cid);
 	const ghobject_t& noid = i.get_oid(op->dest_oid);
 	OnodeRef& no = ovec[op->dest_oid];
@@ -6676,8 +6676,6 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t)
 	  no = c->get_onode(noid, false);
 	}
 	r = _rename(txc, c, o, no, noid);
-	if (r == -ENOENT && op->op == Transaction::OP_TRY_RENAME)
-	  r = 0;
       }
       break;