From: huanwen ren <ren.huanwen@zte.com.cn>
Date: Thu, 4 Feb 2016 09:47:18 +0000 (+0800)
Subject: mon/handle_probe_probe: redundant definition
X-Git-Tag: v10.1.0~371^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17d37be56b4027e7ddfb554a6db248db537f7bec;p=ceph.git

mon/handle_probe_probe: redundant definition

Move the first "MMonProbe *r" to the right location

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 42d265ba7a25..3ada8222cc94 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1592,7 +1592,6 @@ void Monitor::handle_probe(MonOpRequestRef op)
 void Monitor::handle_probe_probe(MonOpRequestRef op)
 {
   MMonProbe *m = static_cast<MMonProbe*>(op->get_req());
-  MMonProbe *r;
 
   dout(10) << "handle_probe_probe " << m->get_source_inst() << *m
 	   << " features " << m->get_connection()->get_features() << dendl;
@@ -1624,7 +1623,8 @@ void Monitor::handle_probe_probe(MonOpRequestRef op)
 
     }
   }
-
+  
+  MMonProbe *r;
   r = new MMonProbe(monmap->fsid, MMonProbe::OP_REPLY, name, has_ever_joined);
   r->name = name;
   r->quorum = quorum;