os/bluestore: Get rid of some Onode constructors

We had 3 constructors that do basically the same.

Signed-off-by: Adam Kupczyk <akupczyk@ibm.com>

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 02dcdca07c3c0e3a88a097fc21ea34fefc7867fb..b47bb61ef7c799dc0bf6acc21f5ed0f550bd2e7a 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4843,7 +4843,7 @@ BlueStore::Onode* BlueStore::Onode::create_decode(
   bool allow_empty)
 {
   ceph_assert(v.length() || allow_empty);
-  Onode* on = new Onode(c.get(), oid, key);
+  Onode* on = new Onode(c.get(), oid, (const mempool::bluestore_cache_meta::string)(key));
 
   if (v.length()) {
     ExtentMap::ExtentDecoderFull edecoder(on->extent_map);

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index f636808ead8e6ba2faa294570137906707db7485..a2cf4705cf63938732769cc0682824da11486b51 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -1381,30 +1381,6 @@ public:
            bluestore_extent_map_inline_shard_prealloc_size),
        bc(*this) {
     }
-    Onode(Collection* c, const ghobject_t& o,
-      const std::string& k)
-      : c(c),
-        oid(o),
-        key(k),
-        exists(false),
-        cached(false),
-        extent_map(this,
-         c->store->cct->_conf->
-           bluestore_extent_map_inline_shard_prealloc_size),
-       bc(*this) {
-    }
-    Onode(Collection* c, const ghobject_t& o,
-      const char* k)
-      : c(c),
-        oid(o),
-        key(k),
-        exists(false),
-        cached(false),
-        extent_map(this,
-         c->store->cct->_conf->
-           bluestore_extent_map_inline_shard_prealloc_size),
-       bc(*this) {
-    }
     Onode(CephContext* cct)
       : c(nullptr),
         exists(false),