From c28cda9bdb125d26a40154cbd6ce87b4cf9e687a Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Thu, 11 Sep 2014 14:25:18 +0800 Subject: [PATCH 2/3] ceph: protect kick_requests() with mdsc->mutex Signed-off-by: Yan, Zheng Reviewed-by: Sage Weil --- fs/ceph/mds_client.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index ece6673..bcf6c77 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2414,9 +2414,8 @@ static void handle_session(struct ceph_mds_session *session, if (session->s_state == CEPH_MDS_SESSION_RECONNECTING) pr_info("mds%d reconnect denied\n", session->s_mds); remove_session_caps(session); - wake = 1; /* for good measure */ + wake = 2; /* for good measure */ wake_up_all(&mdsc->session_close_wq); - kick_requests(mdsc, mds); break; case CEPH_SESSION_STALE: @@ -2446,6 +2445,8 @@ static void handle_session(struct ceph_mds_session *session, if (wake) { mutex_lock(&mdsc->mutex); __wake_requests(mdsc, &session->s_waiting); + if (wake == 2) + kick_requests(mdsc, mds); mutex_unlock(&mdsc->mutex); } return; -- 1.9.3