]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
msgr: fix a typo/goto-cross from dd4addef2d
authorGreg Farnum <greg@inktank.com>
Wed, 17 Jul 2013 22:23:12 +0000 (15:23 -0700)
committerSage Weil <sage@inktank.com>
Wed, 24 Jul 2013 23:20:36 +0000 (16:20 -0700)
We didn't build or review carefully enough!

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 1a84411209b13084b3edb87897d5d678937e3299)

src/msg/Pipe.cc

index 1d6bc157ec269ca21578cabfeb204012e59c3585..092abdd292c56686853fdfe527b8a351553c3f61 100644 (file)
@@ -233,6 +233,7 @@ int Pipe::accept()
   uint64_t feat_missing;
   bool replaced = false;
   CryptoKey session_key;
+  int removed; // single-use down below
 
   // this should roughly mirror pseudocode at
   //  http://ceph.newdream.net/wiki/Messaging_protocol
@@ -616,7 +617,7 @@ int Pipe::accept()
   // ok!
   if (msgr->dispatch_queue.stop)
     goto shutting_down;
-  inr removed = msgr->accepting_pipes.erase(this);
+  removed = msgr->accepting_pipes.erase(this);
   assert(removed == 1);
   register_pipe();
   msgr->lock.Unlock();