os/bluestore: use auto for freelist map type

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 4cf1500d695ff76a1e06fffceecdace26375d8cd..ffab0cd066029e7ba375a56726b060825f1861b9 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -981,7 +981,7 @@ int BlueStore::_open_alloc()
 
   alloc = Allocator::create("stupid");
   uint64_t num = 0, bytes = 0;
-  const map<uint64_t,uint64_t>& fl = fm->get_freelist();
+  const auto& fl = fm->get_freelist();
   for (auto& p : fl) {
     alloc->init_add_free(p.first, p.second);
     ++num;
@@ -2157,8 +2157,8 @@ int BlueStore::fsck()
 
   dout(1) << __func__ << " checking freelist vs allocated" << dendl;
   {
-    const map<uint64_t,uint64_t>& free = fm->get_freelist();
-    for (map<uint64_t,uint64_t>::const_iterator p = free.begin();
+    const auto& free = fm->get_freelist();
+    for (auto p = free.begin();
         p != free.end(); ++p) {
       if (used_blocks.intersects(p->first, p->second)) {
        derr << __func__ << " free extent " << p->first << "~" << p->second

diff --git a/src/os/bluestore/FreelistManager.cc b/src/os/bluestore/FreelistManager.cc
index b3694fb7bbed35678050bb6617ec4fc425745739..eb937a01ac0b03f80221b4883c615d6425648738 100644 (file)
--- a/src/os/bluestore/FreelistManager.cc
+++ b/src/os/bluestore/FreelistManager.cc
@@ -80,7 +80,7 @@ void FreelistManager::dump()
   Mutex::Locker l(lock);
   dout(30) << __func__ << " " << total_free
           << " in " << kv_free.size() << " extents" << dendl;
-  for (std::map<uint64_t,uint64_t>::iterator p = kv_free.begin();
+  for (auto p = kv_free.begin();
        p != kv_free.end();
        ++p) {
     dout(30) << __func__ << "  " << p->first << "~" << p->second << dendl;
@@ -109,7 +109,7 @@ int FreelistManager::allocate(
   Mutex::Locker l(lock);
   dout(10) << __func__ << " " << offset << "~" << length << dendl;
   total_free -= length;
-  map<uint64_t,uint64_t>::iterator p = kv_free.lower_bound(offset);
+  auto p = kv_free.lower_bound(offset);
   if ((p == kv_free.end() || p->first > offset) &&
       p != kv_free.begin()) {
     --p;
@@ -182,7 +182,7 @@ int FreelistManager::release(
   Mutex::Locker l(lock);
   dout(10) << __func__ << " " << offset << "~" << length << dendl;
   total_free += length;
-  map<uint64_t,uint64_t>::iterator p = kv_free.lower_bound(offset);
+  auto p = kv_free.lower_bound(offset);
 
   // contiguous with previous extent?
   if (p != kv_free.begin()) {