mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
nfs41: rename cl_state session SETUP bit to RESET
The bit is no longer used for session setup, only for session reset. Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
4d643d1dfa
commit
6df08189ff
4 changed files with 10 additions and 10 deletions
|
@ -183,7 +183,7 @@ static inline void nfs4_restart_rpc(struct rpc_task *task,
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_NFS_V4_1
|
#ifdef CONFIG_NFS_V4_1
|
||||||
if (nfs4_has_session(clp) &&
|
if (nfs4_has_session(clp) &&
|
||||||
test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)) {
|
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state)) {
|
||||||
rpc_restart_call_prepare(task);
|
rpc_restart_call_prepare(task);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ enum nfs4_client_state {
|
||||||
NFS4CLNT_RECLAIM_REBOOT,
|
NFS4CLNT_RECLAIM_REBOOT,
|
||||||
NFS4CLNT_RECLAIM_NOGRACE,
|
NFS4CLNT_RECLAIM_NOGRACE,
|
||||||
NFS4CLNT_DELEGRETURN,
|
NFS4CLNT_DELEGRETURN,
|
||||||
NFS4CLNT_SESSION_SETUP,
|
NFS4CLNT_SESSION_RESET,
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -270,7 +270,7 @@ static int nfs4_handle_exception(const struct nfs_server *server, int errorcode,
|
||||||
case -NFS4ERR_SEQ_MISORDERED:
|
case -NFS4ERR_SEQ_MISORDERED:
|
||||||
dprintk("%s ERROR: %d Reset session\n", __func__,
|
dprintk("%s ERROR: %d Reset session\n", __func__,
|
||||||
errorcode);
|
errorcode);
|
||||||
set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state);
|
set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);
|
||||||
exception->retry = 1;
|
exception->retry = 1;
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
#endif /* !defined(CONFIG_NFS_V4_1) */
|
#endif /* !defined(CONFIG_NFS_V4_1) */
|
||||||
|
@ -446,7 +446,7 @@ static int nfs4_recover_session(struct nfs4_session *session)
|
||||||
ret = nfs4_wait_clnt_recover(clp);
|
ret = nfs4_wait_clnt_recover(clp);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
break;
|
break;
|
||||||
if (!test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state))
|
if (!test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
|
||||||
break;
|
break;
|
||||||
nfs4_schedule_state_manager(clp);
|
nfs4_schedule_state_manager(clp);
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
|
@ -475,7 +475,7 @@ static int nfs41_setup_sequence(struct nfs4_session *session,
|
||||||
tbl = &session->fc_slot_table;
|
tbl = &session->fc_slot_table;
|
||||||
|
|
||||||
spin_lock(&tbl->slot_tbl_lock);
|
spin_lock(&tbl->slot_tbl_lock);
|
||||||
if (test_bit(NFS4CLNT_SESSION_SETUP, &session->clp->cl_state)) {
|
if (test_bit(NFS4CLNT_SESSION_RESET, &session->clp->cl_state)) {
|
||||||
if (tbl->highest_used_slotid != -1) {
|
if (tbl->highest_used_slotid != -1) {
|
||||||
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
|
rpc_sleep_on(&tbl->slot_tbl_waitq, task, NULL);
|
||||||
spin_unlock(&tbl->slot_tbl_lock);
|
spin_unlock(&tbl->slot_tbl_lock);
|
||||||
|
@ -3363,7 +3363,7 @@ _nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
|
||||||
case -NFS4ERR_SEQ_MISORDERED:
|
case -NFS4ERR_SEQ_MISORDERED:
|
||||||
dprintk("%s ERROR %d, Reset session\n", __func__,
|
dprintk("%s ERROR %d, Reset session\n", __func__,
|
||||||
task->tk_status);
|
task->tk_status);
|
||||||
set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state);
|
set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);
|
||||||
task->tk_status = 0;
|
task->tk_status = 0;
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
#endif /* CONFIG_NFS_V4_1 */
|
#endif /* CONFIG_NFS_V4_1 */
|
||||||
|
|
|
@ -1092,7 +1092,7 @@ static int nfs4_recovery_handle_error(struct nfs_client *clp, int error)
|
||||||
case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
|
case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION:
|
||||||
case -NFS4ERR_SEQ_FALSE_RETRY:
|
case -NFS4ERR_SEQ_FALSE_RETRY:
|
||||||
case -NFS4ERR_SEQ_MISORDERED:
|
case -NFS4ERR_SEQ_MISORDERED:
|
||||||
set_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state);
|
set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state);
|
||||||
}
|
}
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
@ -1256,7 +1256,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Initialize or reset the session */
|
/* Initialize or reset the session */
|
||||||
if (test_and_clear_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state)
|
if (test_and_clear_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state)
|
||||||
&& nfs4_has_session(clp)) {
|
&& nfs4_has_session(clp)) {
|
||||||
status = nfs4_reset_session(clp);
|
status = nfs4_reset_session(clp);
|
||||||
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
|
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
|
||||||
|
@ -1270,7 +1270,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
status = nfs4_do_reclaim(clp,
|
status = nfs4_do_reclaim(clp,
|
||||||
nfs4_reboot_recovery_ops[clp->cl_minorversion]);
|
nfs4_reboot_recovery_ops[clp->cl_minorversion]);
|
||||||
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state))
|
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state))
|
||||||
continue;
|
continue;
|
||||||
nfs4_state_end_reclaim_reboot(clp);
|
nfs4_state_end_reclaim_reboot(clp);
|
||||||
if (test_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state))
|
if (test_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state))
|
||||||
|
@ -1284,7 +1284,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
|
||||||
status = nfs4_do_reclaim(clp,
|
status = nfs4_do_reclaim(clp,
|
||||||
nfs4_nograce_recovery_ops[clp->cl_minorversion]);
|
nfs4_nograce_recovery_ops[clp->cl_minorversion]);
|
||||||
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
if (test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_SESSION_SETUP, &clp->cl_state) ||
|
test_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state) ||
|
||||||
test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
test_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state))
|
||||||
continue;
|
continue;
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
|
|
Loading…
Reference in a new issue