From eb92ea2ed3be088b8f1b5a249c53e085a86f76c5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 9 Jun 2016 15:22:13 -0400 Subject: [PATCH] os/bluestore: remove Onode's BufferSpace (now unused) Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 6 +++--- src/os/bluestore/BlueStore.h | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 0f99e0a15a992..a78bbc29ffbcc 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -796,7 +796,7 @@ void BlueStore::OnodeSpace::rename(OnodeRef& oldo, OnodeRef o = po->second; // install a non-existent onode at old location - oldo.reset(new Onode(this, old_oid, o->key, o->bc.cache)); + oldo.reset(new Onode(this, old_oid, o->key)); po->second = oldo; cache->onode_lru.push_back(*po->second); @@ -970,11 +970,11 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode( return OnodeRef(); // new - on = new Onode(&onode_map, oid, key, cache); + on = new Onode(&onode_map, oid, key); } else { // loaded assert(r >=0); - on = new Onode(&onode_map, oid, key, cache); + on = new Onode(&onode_map, oid, key); on->exists = true; bufferlist::iterator p = v.begin(); ::decode(on->onode, p); diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 832402e011f55..7cd38584b0eb3 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -461,15 +461,12 @@ public: std::condition_variable flush_cond; ///< wait here for unapplied txns set flush_txns; ///< committing or wal txns - BufferSpace bc; - - Onode(OnodeSpace *s, const ghobject_t& o, const string& k, Cache *c) + Onode(OnodeSpace *s, const ghobject_t& o, const string& k) : nref(0), oid(o), key(k), space(s), - exists(false), - bc(c) { + exists(false) { } Blob *get_blob(int64_t id) { -- 2.39.5