Merge pull request #7383 from liewegas/wip-bluestore

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

diff --cc src/os/bluestore/BlueFS.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.h
Simple merge

diff --cc src/os/kstore/KStore.cc
index d41a787e35411d0f5dcaaec02be51668bace97da,006d4f43410af0f08e37e8469d9fa41192da0bb2..281a847d0908fde6eaeb23126eb903d14fb3abd4
--- 1/src/os/kstore/KStore.cc
--- 2/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;