Merge pull request #18528 from tchaikov/wip-osd-misplaced

osd/PG: fix calc of misplaced objects

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

src/osd/PG.cc

@@ -2668,11 +2668,12 @@ void PG::_update_calc_stats()
 
     // Add recovery objects not part of actingbackfill to be used to reduce
     // degraded and account as misplaced.
-    for (auto i = peer_info.begin() ; i != peer_info.end() ; ++i) {
-      if (actingbackfill.find(i->first) == actingbackfill.end())
-	object_copies += i->second.stats.stats.sum.num_objects;
-	misplaced += i->second.stats.stats.sum.num_objects;
+    for (const auto& peer : peer_info) {
+      if (actingbackfill.find(peer.first) == actingbackfill.end()) {
+	object_copies += peer.second.stats.stats.sum.num_objects;
+	misplaced += peer.second.stats.stats.sum.num_objects;
 	++num_misplaced;
+      }
     }
     if (object_copies)
       dout(20) << __func__ << " objects not part of up/acting " << object_copies << dendl;