From: Sage Weil <sage@redhat.com>
Date: Sun, 31 Jan 2016 15:00:10 +0000 (-0500)
Subject: Merge pull request #7383 from liewegas/wip-bluestore
X-Git-Tag: v10.0.4~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74c87566fdd1b20d41a1a034b95e71774667b4ac;p=ceph.git

Merge pull request #7383 from liewegas/wip-bluestore

osd: bluestore: some new c++11-isms, a couple reverts
---

74c87566fdd1b20d41a1a034b95e71774667b4ac
diff --cc src/os/kstore/KStore.cc
index d41a787e3541,006d4f43410a..281a847d0908
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@@ -3527,21 -3509,11 +3521,13 @@@ int KStore::_clone(TransContext *txc
      r = -ENOENT;
      goto out;
    }
-  
-   newo = c->get_onode(new_oid, false);
-   if (newo) {
-     // already exist, truncate any old data
-     r = _do_truncate(txc, newo, 0);
-     if (r < 0)
-       goto out;
-   } else {
-     // does not exist, create it
-     newo = c->get_onode(new_oid, true);
-     _assign_nid(txc, newo);
-   }
+   newo = c->get_onode(new_oid, true);
+   assert(newo);
+   newo->exists = true;
+   _assign_nid(txc, newo);
  
 +  oldo->flush();
 +
    r = _do_read(oldo, 0, oldo->onode.size, bl, 0);
    if (r < 0)
      goto out;