From: Sage Weil Date: Sat, 9 Jun 2012 21:19:21 +0000 (-0700) Subject: libceph: transition socket state prior to actual connect X-Git-Tag: v3.6-rc1~36^2~105 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89a86be0ce20022f6ede8bccec078dbb3d63caaa;p=platform%2Fupstream%2Fkernel-adaptation-pc.git libceph: transition socket state prior to actual connect Once we call ->connect(), we are racing against the actual connection, and a subsequent transition from CONNECTING -> CONNECTED. Set the state to CONNECTING before that, under the protection of the mutex, to avoid the race. This was introduced in 928443cd9644e7cfd46f687dbeffda2d1a357ff9, with the original socket state code. Signed-off-by: Sage Weil Reviewed-by: Alex Elder --- diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 769a2c9..bdbecac 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -321,6 +321,7 @@ static int ceph_tcp_connect(struct ceph_connection *con) dout("connect %s\n", ceph_pr_addr(&con->peer_addr.in_addr)); + con_sock_state_connecting(con); ret = sock->ops->connect(sock, (struct sockaddr *)paddr, sizeof(*paddr), O_NONBLOCK); if (ret == -EINPROGRESS) { @@ -336,8 +337,6 @@ static int ceph_tcp_connect(struct ceph_connection *con) return ret; } con->sock = sock; - con_sock_state_connecting(con); - return 0; }