From 87ccb1aa923bf2bb30582c4e7c78e9c8e57d0e7d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 9 Jun 2012 14:19:21 -0700 Subject: [PATCH] --- yaml --- r: 320279 b: refs/heads/master c: 89a86be0ce20022f6ede8bccec078dbb3d63caaa h: refs/heads/master i: 320277: a1830dbee8eb49c357bab5b5a2f2d45ac4e3430d 320275: b9b666f462765c39aa1ddaba84648d7a2b4bf647 320271: 8a19e7624f58a221ccdbc4165c289eab2d883516 v: v3 --- [refs] | 2 +- trunk/net/ceph/messenger.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 33d98927fb71..0003d58a101d 100644 --- 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 index 769a2c9fe1af..bdbecac2d69d 100644 --- 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; }