diff options
| author | Sage Weil <sage@inktank.com> | 2013-07-16 13:01:18 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-07-17 14:34:40 -0700 |
| commit | ad548e72fd94b4a16717abd3b3f1d1be4a3476cf (patch) | |
| tree | 77727bb2d06ba681fbe2d0c530452099225faeea | |
| parent | 9f1c27261811733f40acf759a72958c3689c8516 (diff) | |
| download | ceph-ad548e72fd94b4a16717abd3b3f1d1be4a3476cf.tar.gz | |
msg/Pipe: unlock msgr->lock earlier in accept()
Small cleanup. Nothing needs msgr->lock for the previously larger
window.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/msg/Pipe.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/msg/Pipe.cc b/src/msg/Pipe.cc index 571c3fa3233..5c10e1b8cd5 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/Pipe.cc @@ -340,13 +340,13 @@ int Pipe::accept() memset(&reply, 0, sizeof(reply)); reply.protocol_version = msgr->get_proto_version(peer_type, false); + msgr->lock.Unlock(); // mismatch? ldout(msgr->cct,10) << "accept my proto " << reply.protocol_version << ", their proto " << connect.protocol_version << dendl; if (connect.protocol_version != reply.protocol_version) { reply.tag = CEPH_MSGR_TAG_BADPROTOVER; - msgr->lock.Unlock(); goto reply; } @@ -372,12 +372,9 @@ int Pipe::accept() if (feat_missing) { ldout(msgr->cct,1) << "peer missing required features " << std::hex << feat_missing << std::dec << dendl; reply.tag = CEPH_MSGR_TAG_FEATURES; - msgr->lock.Unlock(); goto reply; } - msgr->lock.Unlock(); - // Check the authorizer. If not good, bail out. if (!msgr->verify_authorizer(connection_state.get(), peer_type, connect.authorizer_protocol, authorizer, |