---

yaml --- r: 320279 b: refs/heads/master c: 89a86be h: refs/heads/master i: 320277: a1830db 320275: b9b666f 320271: 8a19e76 v: v3
git-mirror · Jun 15, 2012 · 87ccb1a · 87ccb1a
1 parent 629515f
commit 87ccb1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5506049500b30dbc5edb4d07a3577477c1f3643
+refs/heads/master: 89a86be0ce20022f6ede8bccec078dbb3d63caaa
diff --git a/trunk/net/ceph/messenger.c b/trunk/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;
 }