From: Sage Weil <sage@redhat.com>
Date: Sat, 11 Mar 2017 19:21:47 +0000 (-0500)
Subject: os/bluestore: make OnodeSpace onode_map private
X-Git-Tag: v12.0.1~12^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4aa44d2b490450dc77d0ebd3bc6b87dd3278e386;p=ceph-ci.git

os/bluestore: make OnodeSpace onode_map private

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 19436c81e69..c276e5cc65f 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -883,7 +883,7 @@ void BlueStore::LRUCache::_trim(uint64_t onode_max, uint64_t buffer_max)
       assert(num == 1);
     }
     o->get();  // paranoia
-    o->c->onode_map.onode_map.erase(o->oid);
+    o->c->onode_map.remove(o->oid);
     o->put();
     --num;
   }
@@ -1150,7 +1150,7 @@ void BlueStore::TwoQCache::_trim(uint64_t onode_max, uint64_t buffer_max)
       assert(num == 1);
     }
     o->get();  // paranoia
-    o->c->onode_map.onode_map.erase(o->oid);
+    o->c->onode_map.remove(o->oid);
     o->put();
     --num;
   }
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 658c8b0b801..eb2dd1dd565 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -1217,11 +1217,13 @@ public:
   };
 
   struct OnodeSpace {
+  private:
     Cache *cache;
 
     /// forward lookups
     mempool::bluestore_meta_other::unordered_map<ghobject_t,OnodeRef> onode_map;
 
+  public:
     OnodeSpace(Cache *c) : cache(c) {}
     ~OnodeSpace() {
       clear();
@@ -1229,6 +1231,9 @@ public:
 
     OnodeRef add(const ghobject_t& oid, OnodeRef o);
     OnodeRef lookup(const ghobject_t& o);
+    void remove(const ghobject_t& oid) {
+      onode_map.erase(oid);
+    }
     void rename(OnodeRef& o, const ghobject_t& old_oid,
 		const ghobject_t& new_oid,
 		const mempool::bluestore_meta_other::string& new_okey);