ceph: protect kick_requests() with mdsc->mutex

commit 656e4382948d4b2c81bdaf707f1400f53eff2625 upstream.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 3e07f82a3c9d105c7798379005ce992ef97d86bf..16c7e4ab94f038aec4b803d5ea445c7320bc51aa 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2389,9 +2389,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:
@@ -2417,6 +2416,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;