From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 18 Nov 2016 18:26:20 +0000 (-0500)
Subject: mds: simplify iteration code
X-Git-Tag: v12.0.2~295^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78a64f11735836688504080c8e5bce7a8d5854bf;p=ceph.git

mds: simplify iteration code

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc
index 6a666725b547..1e86b5da769c 100644
--- a/src/mds/MDSMap.cc
+++ b/src/mds/MDSMap.cc
@@ -374,14 +374,12 @@ void MDSMap::get_health(list<pair<health_status_t,string> >& summary,
     }
   }
 
-  map<mds_rank_t, mds_gid_t>::const_iterator u = up.begin();
-  map<mds_rank_t, mds_gid_t>::const_iterator u_end = up.end();
   map<mds_gid_t, mds_info_t>::const_iterator m_end = mds_info.end();
   set<string> laggy;
-  for (; u != u_end; ++u) {
-    map<mds_gid_t, mds_info_t>::const_iterator m = mds_info.find(u->second);
+  for (const auto &u : up) {
+    map<mds_gid_t, mds_info_t>::const_iterator m = mds_info.find(u.second);
     if (m == m_end) {
-      std::cerr << "Up rank " << u->first << " GID " << u->second << " not found!" << std::endl;
+      std::cerr << "Up rank " << u.first << " GID " << u.second << " not found!" << std::endl;
     }
     assert(m != m_end);
     const mds_info_t &mds_info(m->second);