From: Greg Farnum <greg@inktank.com>
Date: Wed, 17 Jul 2013 22:23:12 +0000 (-0700)
Subject: msgr: fix a typo/goto-cross from dd4addef2d
X-Git-Tag: v0.61.8~23^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce6a0b74459996f91a0511a4a7147179bcd47876;p=ceph.git

msgr: fix a typo/goto-cross from dd4addef2d

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)
---

diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index 1d6bc157ec2..092abdd292c 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -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();