diff options
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 528b60a23ed5..ff1c7344e086 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
| @@ -270,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode, | |||
| 270 | case -NFS4ERR_SEQ_MISORDERED: | 270 | case -NFS4ERR_SEQ_MISORDERED: |
| 271 | dprintk("%s ERROR: %d Reset session\n", __func__, | 271 | dprintk("%s ERROR: %d Reset session\n", __func__, |
| 272 | errorcode); | 272 | errorcode); |
| 273 | set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state); | 273 | set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); |
| 274 | exception->retry = 1; | 274 | exception->retry = 1; |
| 275 | /* FALLTHROUGH */ | 275 | /* FALLTHROUGH */ |
| 276 | #endif /* !defined(CONFIG_NFS_V4_1) */ | 276 | #endif /* !defined(CONFIG_NFS_V4_1) */ |
| @@ -446,7 +446,7 @@ static int nfs4_recover_session(struct nfs4_session *session) | |||
| 446 | ret = nfs4_wait_clnt_recover(clp); | 446 | ret = nfs4_wait_clnt_recover(clp); |
| 447 | if (ret != 0) | 447 | if (ret != 0) |
| 448 | break; | 448 | break; |
| 449 | if (!test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)) | 449 | if (!test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state)) |
| 450 | break; | 450 | break; |
| 451 | nfs4_schedule_state_manager(clp); | 451 | nfs4_schedule_state_manager(clp); |
| 452 | ret = -EIO; | 452 | ret = -EIO; |
| @@ -475,7 +475,7 @@ static int nfs41_setup_sequence(struct nfs4_session *session, | |||
| 475 | tbl = &session->fc_slot_table; | 475 | tbl = &session->fc_slot_table; |
| 476 | 476 | ||
| 477 | spin_lock(&tbl->slot_tbl_lock); | 477 | spin_lock(&tbl->slot_tbl_lock); |
| 478 | if (test_bit(NFS4CLNT_SESSION_SETUP, &session->clp->cl_state)) { | 478 | if (test_bit(NFS4CLNT_SESSION_RESET, &session->clp->cl_state)) { |
| 479 | if (tbl->highest_used_slotid != -1) { | 479 | if (tbl->highest_used_slotid != -1) { |
| 480 | rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); | 480 | rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL); |
| 481 | spin_unlock(&tbl->slot_tbl_lock); | 481 | spin_unlock(&tbl->slot_tbl_lock); |
| @@ -3363,7 +3363,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, | |||
| 3363 | case -NFS4ERR_SEQ_MISORDERED: | 3363 | case -NFS4ERR_SEQ_MISORDERED: |
| 3364 | dprintk("%s ERROR %d, Reset session\n", __func__, | 3364 | dprintk("%s ERROR %d, Reset session\n", __func__, |
| 3365 | task->tk_status); | 3365 | task->tk_status); |
| 3366 | set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state); | 3366 | set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); |
| 3367 | task->tk_status = 0; | 3367 | task->tk_status = 0; |
| 3368 | return -EAGAIN; | 3368 | return -EAGAIN; |
| 3369 | #endif /* CONFIG_NFS_V4_1 */ | 3369 | #endif /* CONFIG_NFS_V4_1 */ |
