korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

libceph: initialize mon_client con only once

Browse Source 
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@inktank.com>
This commit is contained in:
Sage Weil 2012-06-27 12:24:34 -07:00
parent b7a9e5dd40
commit 735a72ef95
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ceph/mon_client.c
View File

@ -119,7 +119,6 @@ static void __close_session(struct ceph_mon_client *monc)
dout("__close_session closing mon%d\n", monc->cur_mon); dout("__close_session closing mon%d\n", monc->cur_mon);
ceph_msg_revoke(monc->m_auth); ceph_msg_revoke(monc->m_auth);
ceph_con_close(&monc->con); ceph_con_close(&monc->con);
monc->con.private = NULL;
monc->cur_mon = -1; monc->cur_mon = -1;
monc->pending_auth = 0; monc->pending_auth = 0;
ceph_auth_reset(monc->auth); 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->sub_renew_after = jiffies; /* i.e., expired */
monc->want_next_osdmap = !!monc->want_next_osdmap; 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); dout("open_session mon%d opening\n", monc->cur_mon);
ceph_con_open(&monc->con, ceph_con_open(&monc->con,
CEPH_ENTITY_TYPE_MON, 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) if (!monc->m_auth)
goto out_auth_reply; goto out_auth_reply;
ceph_con_init(&monc->con, monc, &mon_con_ops,
&monc->client->msgr);
monc->cur_mon = -1; monc->cur_mon = -1;
monc->hunting = true; monc->hunting = true;
monc->sub_renew_after = jiffies; monc->sub_renew_after = jiffies;