]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
msg/Pipe: unlock msgr->lock earlier in accept()
authorSage Weil <sage@inktank.com>
Tue, 16 Jul 2013 20:01:18 +0000 (13:01 -0700)
committerSage Weil <sage@inktank.com>
Wed, 24 Jul 2013 23:20:36 +0000 (16:20 -0700)
Small cleanup.  Nothing needs msgr->lock for the previously larger
window.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit ad548e72fd94b4a16717abd3b3f1d1be4a3476cf)

src/msg/Pipe.cc

index ad7ee49d2fb9377ddf19a625bcf1489add045b14..d2bb5141294200f33b1541062f3232acc2dd3812 100644 (file)
@@ -341,13 +341,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;
     }
 
@@ -373,12 +373,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, peer_type, connect.authorizer_protocol, authorizer,