os/bluestore: unique type names or onode and buffer lrus

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 388a0f7861de3ddd399ef20b18cbc412cd8c8a0c..672796168a3cd1447e29a8ac057c50e5a70137d9 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -454,7 +454,7 @@ ostream& operator<<(ostream& out, const BlueStore::Buffer& b)
 void BlueStore::BufferCache::trim(uint64_t keep)
 {
   audit_lru();
-  lru_list_t::iterator i = lru.end();
+  auto i = lru.end();
   if (size) {
     assert(i != lru.begin());
     --i;
@@ -663,7 +663,7 @@ void BlueStore::Onode::flush()
 
 void BlueStore::OnodeHashLRU::_touch(OnodeRef o)
 {
-  lru_list_t::iterator p = lru.iterator_to(*o);
+  auto p = lru.iterator_to(*o);
   lru.erase(p);
   lru.push_front(*o);
 }
@@ -714,7 +714,7 @@ void BlueStore::OnodeHashLRU::rename(OnodeRef& oldo,
   assert(po != onode_map.end());
   if (pn != onode_map.end()) {
     dout(30) << __func__ << "  removing target " << pn->second << dendl;
-    lru_list_t::iterator p = lru.iterator_to(*pn->second);
+    auto p = lru.iterator_to(*pn->second);
     lru.erase(p);
     onode_map.erase(pn);
   }
@@ -752,7 +752,7 @@ bool BlueStore::OnodeHashLRU::get_next(
 
   ceph::unordered_map<ghobject_t,OnodeRef>::iterator p = onode_map.find(after);
   assert(p != onode_map.end()); // for now
-  lru_list_t::iterator pi = lru.iterator_to(*p->second);
+  auto pi = lru.iterator_to(*p->second);
   ++pi;
   if (pi == lru.end()) {
     return false;
@@ -779,7 +779,7 @@ int BlueStore::OnodeHashLRU::_trim(int max)
   if (onode_map.size() == 0 || num <= 0)
     return 0; // don't even try
   
-  lru_list_t::iterator p = lru.end();
+  auto p = lru.end();
   if (num)
     --p;
   while (num > 0) {

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index 7e909528e4abc96257eb07e770bab5704191cf44..0df6ff72c3f37e1993cd42ee6a3695578d9b68e6 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -188,9 +188,9 @@ public:
       boost::intrusive::member_hook<
        Buffer,
        boost::intrusive::list_member_hook<>,
-       &Buffer::lru_item> > lru_list_t;
+       &Buffer::lru_item> > buffer_lru_list_t;
 
-    lru_list_t lru;
+    buffer_lru_list_t lru;
     uint64_t size = 0;
 
     void trim(uint64_t keep);
@@ -413,11 +413,11 @@ public:
       boost::intrusive::member_hook<
         Onode,
        boost::intrusive::list_member_hook<>,
-       &Onode::lru_item> > lru_list_t;
+       &Onode::lru_item> > onode_lru_list_t;
 
     std::mutex lock;
     ceph::unordered_map<ghobject_t,OnodeRef> onode_map;  ///< forward lookups
-    lru_list_t lru;                                      ///< lru
+    onode_lru_list_t lru;                                ///< lru
     size_t max_size;
 
     OnodeHashLRU(size_t s) : max_size(s) {}