From: Shinobu Kinjo <shinobu@redhat.com>
Date: Sat, 6 Jan 2018 02:06:33 +0000 (+0900)
Subject: osd: Remove redundant local variable declaration
X-Git-Tag: v13.0.2~568^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19812%2Fhead;p=ceph.git

osd: Remove redundant local variable declaration

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4633f97b3d3..b19c48a63c2 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4595,7 +4595,7 @@ void OSD::maybe_update_heartbeat_peers()
 
   // include next and previous up osds to ensure we have a fully-connected set
   set<int> want, extras;
-  int next = osdmap->get_next_up_osd_after(whoami);
+  const int next = osdmap->get_next_up_osd_after(whoami);
   if (next >= 0)
     want.insert(next);
   int prev = osdmap->get_previous_up_osd_before(whoami);
@@ -4624,8 +4624,7 @@ void OSD::maybe_update_heartbeat_peers()
   }
 
   // too few?
-  int start = osdmap->get_next_up_osd_after(whoami);
-  for (int n = start; n >= 0; ) {
+  for (int n = next; n >= 0; ) {
     if ((int)heartbeat_peers.size() >= cct->_conf->osd_heartbeat_min_peers)
       break;
     if (!extras.count(n) && !want.count(n) && n != whoami) {
@@ -4634,7 +4633,7 @@ void OSD::maybe_update_heartbeat_peers()
       _add_heartbeat_peer(n);
     }
     n = osdmap->get_next_up_osd_after(n);
-    if (n == start)
+    if (n == next)
       break;  // came full circle; stop
   }