]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: remove Onode's BufferSpace
authorSage Weil <sage@redhat.com>
Thu, 9 Jun 2016 19:22:13 +0000 (15:22 -0400)
committerSage Weil <sage@redhat.com>
Thu, 16 Jun 2016 14:13:58 +0000 (10:13 -0400)
(now unused)

Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

index 0f99e0a15a992f522ba68847c4d463020b671d50..a78bbc29ffbccc9913f441ca9bd5190a0d355678 100644 (file)
@@ -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);
index 832402e011f552defd08cdcc609b5edd9adf7e67..7cd38584b0eb37e2922c6aba209eec6b1eb27bf0 100644 (file)
@@ -461,15 +461,12 @@ public:
     std::condition_variable flush_cond;   ///< wait here for unapplied txns
     set<TransContext*> 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) {