summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Farnum <greg@inktank.com>2013-07-17 15:23:12 -0700
committerGreg Farnum <greg@inktank.com>2013-07-17 15:23:12 -0700
commit1a84411209b13084b3edb87897d5d678937e3299 (patch)
treeb60865c490679d60675032818f90e66e2a9473d1
parentea1c623406ac0761c6d63041dcc5ca849d1fa932 (diff)
downloadceph-1a84411209b13084b3edb87897d5d678937e3299.tar.gz
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>
-rw-r--r--src/msg/Pipe.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc
index e3600c8e2e6..bff0b996b20 100644
--- a/src/msg/Pipe.cc
+++ b/src/msg/Pipe.cc
@@ -231,6 +231,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
@@ -639,7 +640,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();