]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "kstore: fix dest onode process logic of clone_range" 7383/head
authorSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 19:22:37 +0000 (14:22 -0500)
committerSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 19:22:37 +0000 (14:22 -0500)
This reverts commit 9ab7998fbe19d076c653ca78d328a2794ef29535.

Signed-off-by: Sage Weil <sage@redhat.com>
src/os/kstore/KStore.cc

index 8905cf121a7dfcc05af19a331421a05e7b3b3742..006d4f43410af0f08e37e8469d9fa41192da0bb2 100644 (file)
@@ -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;