Patchwork [3.5.yuz,extended,stable] Patch "libceph: close socket directly from ceph_con_close()" has been added to staging queue

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


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

    libceph: close socket directly from ceph_con_close()

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 dce3e9571d0008f7c12ca5dc81b522ee787654f6 Mon Sep 17 00:00:00 2001
From: Sage Weil <>
Date: Fri, 20 Jul 2012 16:45:49 -0700
Subject: [PATCH 58/78] libceph: close socket directly from ceph_con_close()

commit ee76e0736db8455e3b11827d6899bd2a4e1d0584 upstream.

It is simpler to do this immediately, since we already hold the con mutex.
It also avoids the need to deal with a not-quite-CLOSED socket in con_work.

Signed-off-by: Sage Weil <>
Signed-off-by: Herton Ronaldo Krzesinski <>
 net/ceph/messenger.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)



diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 32ab7cd..46ce113 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -519,14 +519,8 @@  void ceph_con_close(struct ceph_connection *con)
 	con->peer_global_seq = 0;
+	con_close_socket(con);
-	/*
-	 * We cannot close the socket directly from here because the
-	 * work threads use it without holding the mutex.  Instead, let
-	 * con_work() do it.
-	 */
-	queue_con(con);