diff options
| author | Greg Farnum <greg@inktank.com> | 2013-07-17 15:23:12 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-24 16:20:36 -0700 |
| commit | ce6a0b74459996f91a0511a4a7147179bcd47876 (patch) | |
| tree | 14a2b70884f554b4248533f2515f5be662be7a20 | |
| parent | 1ed51ad535612d5c444a3cc35a331f5e6a68ce30 (diff) | |
| download | ceph-ce6a0b74459996f91a0511a4a7147179bcd47876.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>
(cherry picked from commit 1a84411209b13084b3edb87897d5d678937e3299)
| -rw-r--r-- | src/msg/Pipe.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |