Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 735a72ef authored by Sage Weil's avatar Sage Weil
Browse files

libceph: initialize mon_client con only once 



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: default avatarSage Weil <sage@inktank.com>
parent b7a9e5dd

net/ceph/mon_client.c

+3 −4
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ static void __close_session(struct ceph_mon_client *monc) 
	dout("__close_session closing mon%d\n", monc->cur_mon);

	ceph_msg_revoke(monc->m_auth);

	ceph_con_close(&monc->con);

	monc->con.private = NULL;

	monc->cur_mon = -1;

	monc->pending_auth = 0;

	ceph_auth_reset(monc->auth);
@@ -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_con_open(&monc->con,

			      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;