From: Greg Farnum <greg@inktank.com>
Date: Tue, 25 Mar 2014 04:38:48 +0000 (-0700)
Subject: OSD: remove never-activated while loop from send_incremental_map
X-Git-Tag: v0.81~57^2~42
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1379c031d551a2f784569e749656fb1716de6cf8;p=ceph.git

OSD: remove never-activated while loop from send_incremental_map

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1ab4fd26b6303..413ec50780fa1 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5991,13 +5991,10 @@ void OSD::send_incremental_map(epoch_t since, Connection *con)
     since = to - cct->_conf->osd_map_share_max_epochs;
   }
 
-  while (since < to) {
-    if (to - since > (epoch_t)cct->_conf->osd_map_message_max)
-      to = since + cct->_conf->osd_map_message_max;
-    MOSDMap *m = build_incremental_map_msg(since, to);
-    send_map(m, con);
-    since = to;
-  }
+  if (to - since > (epoch_t)cct->_conf->osd_map_message_max)
+    to = since + cct->_conf->osd_map_message_max;
+  MOSDMap *m = build_incremental_map_msg(since, to);
+  send_map(m, con);
 }
 
 bool OSDService::_get_map_bl(epoch_t e, bufferlist& bl)