From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Jan 2016 19:22:37 +0000 (-0500)
Subject: Revert "kstore: fix dest onode process logic of clone_range"
X-Git-Tag: v10.0.4~101^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d3579d309a92ecdf36f2f5ade5d05514fb93a9f;p=ceph.git

Revert "kstore: fix dest onode process logic of clone_range"

This reverts commit 9ab7998fbe19d076c653ca78d328a2794ef29535.

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

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index 8905cf121a7d..006d4f43410a 100644
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -3587,11 +3587,7 @@ int KStore::_clone_range(TransContext *txc,
     r = -ENOENT;
     goto out;
   }
-  newo = c->get_onode(new_oid, false);
-  if (!newo) {
-    newo = c->get_onode(new_oid, true);
-    _assign_nid(txc, newo);
-  }
+  newo = c->get_onode(new_oid, true);
   assert(newo);
   newo->exists = true;