[ 3.5.yuz extended stable ] Patch "libceph: initialize mon_client con only once" has been added to staging queue

Herton Ronaldo Krzesinski herton.krzesinski at canonical.com
Tue Nov 20 17:17:45 UTC 2012

This is a note to let you know that I have just added a patch titled

    libceph: initialize mon_client con only once

to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree 
which can be found at:


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 07f4babd3e6d7333c38d344b3df1d60881cb48cc Mon Sep 17 00:00:00 2001
From: Sage Weil <sage at inktank.com>
Date: Wed, 27 Jun 2012 12:24:34 -0700
Subject: [PATCH 44/78] libceph: initialize mon_client con only once

commit 735a72ef952d42a256f79ae3e6dc1c17a45c041b upstream.

Do not re-initialize the con on every connection attempt.  When we
ceph_con_close, there may still be work queued on the socket (e.g., to
close it), and re-initializing will clobber the work_struct state.

Signed-off-by: Sage Weil <sage at inktank.com>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
 net/ceph/mon_client.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index bcc80a0..bfd21a8 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -119,7 +119,6 @@ static void __close_session(struct ceph_mon_client *monc)
 	dout("__close_session closing mon%d\n", monc->cur_mon);
-	monc->con.private = NULL;
 	monc->cur_mon = -1;
 	monc->pending_auth = 0;
@@ -142,9 +141,6 @@ static int __open_session(struct ceph_mon_client *monc)
 		monc->sub_renew_after = jiffies;  /* i.e., expired */
 		monc->want_next_osdmap = !!monc->want_next_osdmap;

-		ceph_con_init(&monc->con, monc, &mon_con_ops,
-			&monc->client->msgr);
 		dout("open_session mon%d opening\n", monc->cur_mon);
 			      CEPH_ENTITY_TYPE_MON, monc->cur_mon,
@@ -798,6 +794,9 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)
 	if (!monc->m_auth)
 		goto out_auth_reply;

+	ceph_con_init(&monc->con, monc, &mon_con_ops,
+		      &monc->client->msgr);
 	monc->cur_mon = -1;
 	monc->hunting = true;
 	monc->sub_renew_after = jiffies;

More information about the kernel-team mailing list