Patchwork [3.5.yuz,extended,stable] Patch "libceph: transition socket state prior to actual" has been added to staging queue

mail settings
Submitter Herton Ronaldo Krzesinski
Date Nov. 20, 2012, 5:16 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/200429/
State New
Headers show


Herton Ronaldo Krzesinski - Nov. 20, 2012, 5:16 p.m.
This is a note to let you know that I have just added a patch titled

    libceph: transition socket state prior to actual

to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree 
which can be found at:;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.yuz tree, see



From 788522dd56108045cc7b25c5edd5b53b6d230d09 Mon Sep 17 00:00:00 2001
From: Sage Weil <>
Date: Sat, 9 Jun 2012 14:19:21 -0700
Subject: [PATCH 22/78] libceph: transition socket state prior to actual

commit 89a86be0ce20022f6ede8bccec078dbb3d63caaa upstream.

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 <>
Signed-off-by: Herton Ronaldo Krzesinski <>
 net/ceph/messenger.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index ff12d32..c52d587 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),
 	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;