From 16b5487ababb54047d38757f489ed08bd7067070 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Wed, 14 Sep 2016 15:19:01 +0800 Subject: [PATCH] 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 --- src/os/bluestore/BlueStore.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index c022e2ee05db8..fd5f2c084e53a 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; -- 2.39.5