openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ceph: protect kick_requests() with mdsc->mutex 

Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Yan, Zheng 2014-09-11 14:25:18 +08:00 committed by Ilya Dryomov
parent b9a678994b
commit 656e438294
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/ceph/mds_client.c
View File

@ -2471,9 +2471,8 @@ static void handle_session(struct ceph_mds_session *session,
if (session->s_state == CEPH_MDS_SESSION_RECONNECTING) if (session->s_state == CEPH_MDS_SESSION_RECONNECTING)
pr_info("mds%d reconnect denied\n", session->s_mds); pr_info("mds%d reconnect denied\n", session->s_mds);
remove_session_caps(session); remove_session_caps(session);
wake = 1; /* for good measure */ wake = 2; /* for good measure */
wake_up_all(&mdsc->session_close_wq); wake_up_all(&mdsc->session_close_wq);
kick_requests(mdsc, mds);
break; break;
case CEPH_SESSION_STALE: case CEPH_SESSION_STALE:
@ -2503,6 +2502,8 @@ static void handle_session(struct ceph_mds_session *session,
if (wake) { if (wake) {
mutex_lock(&mdsc->mutex); mutex_lock(&mdsc->mutex);
__wake_requests(mdsc, &session->s_waiting); __wake_requests(mdsc, &session->s_waiting);
if (wake == 2)
kick_requests(mdsc, mds);
mutex_unlock(&mdsc->mutex); mutex_unlock(&mdsc->mutex);
} }
return; return;