From d913e5e670282c19a35c6cb420fc1d711c388cc4 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@redhat.com>
Date: Fri, 17 Feb 2012 09:14:16 -0800
Subject: [PATCH] osd: change nested iterator name

Don't shadow the iterator variable.

Signed-off-by: Tom Callaway <spot@redhat.com>
Signed-off-by: David Nalley <david@gnsa.us>
---
 src/osd/PG.cc           | 6 +++---
 src/osd/ReplicatedPG.cc | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 47e62bb288f9b..1560a7c87b5c4 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4838,13 +4838,13 @@ bool PG::PriorSet::affected_by_map(const OSDMapRef osdmap, const PG *debug_pg) c
     }
 
     // did a down osd in cur get (re)marked as lost?
-    map<int,epoch_t>::const_iterator p = blocked_by.find(o);
-    if (p != blocked_by.end()) {
+    map<int,epoch_t>::const_iterator r = blocked_by.find(o);
+    if (r != blocked_by.end()) {
       if (!osdmap->exists(o)) {
 	dout(10) << "affected_by_map osd." << o << " no longer exists" << dendl;
 	return true;
       }
-      if (osdmap->get_info(o).lost_at != p->second) {
+      if (osdmap->get_info(o).lost_at != r->second) {
 	dout(10) << "affected_by_map osd." << o << " (re)marked as lost" << dendl;
 	return true;
       }
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 94071615f745e..47117bd53f2c2 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5523,8 +5523,8 @@ int ReplicatedPG::recover_replicas(int max)
       }
 
       dout(10) << __func__ << ": recover_object_replicas(" << soid << ")" << dendl;
-      map<hobject_t,pg_missing_t::item>::const_iterator p = m.missing.find(soid);
-      started += recover_object_replicas(soid, p->second.need);
+      map<hobject_t,pg_missing_t::item>::const_iterator r = m.missing.find(soid);
+      started += recover_object_replicas(soid, r->second.need);
     }
   }
 
-- 
2.47.3