]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/handle_probe_probe: redundant definition
authorhuanwen ren <ren.huanwen@zte.com.cn>
Thu, 4 Feb 2016 09:47:18 +0000 (17:47 +0800)
committerhuanwen ren <ren.huanwen@zte.com.cn>
Fri, 5 Feb 2016 07:15:40 +0000 (15:15 +0800)
Move the first "MMonProbe *r" to the right location

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
src/mon/Monitor.cc

index 42d265ba7a256f51628395c80f8a55b2265d896c..3ada8222cc94eb2fc54508ce3036acc9b06ee69a 100644 (file)
@@ -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;