aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Labiaga <Ricardo.Labiaga@netapp.com>2009-12-07 09:16:09 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-12-07 09:16:09 -0500
commitf455848a11cbbf15989609a46b24e81a6f13a08e (patch)
treefb265ecee9a7dc6f40175d21609c6dffcd8ae93f
parent0110ee152b69f8cbde19d8bc1dd59e197e419d76 (diff)
nfs41: Mark stateids in need of reclaim if state manager gets stale clientid
The state manager was not marking the stateids as needing to be reclaimed after reestablishing the clientid. Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4state.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 1b629cca707..1936036f629 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1255,14 +1255,6 @@ void nfs41_handle_sequence_flag_errors(struct nfs_client *clp, u32 flags)
nfs_expire_all_delegations(clp);
}
-static void nfs4_session_recovery_handle_error(struct nfs_client *clp, int err)
-{
- switch (err) {
- case -NFS4ERR_STALE_CLIENTID:
- set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
- }
-}
-
static int nfs4_reset_session(struct nfs_client *clp)
{
struct nfs4_session *ses = clp->cl_session;
@@ -1275,14 +1267,14 @@ static int nfs4_reset_session(struct nfs_client *clp)
status = nfs4_proc_destroy_session(clp->cl_session);
if (status && status != -NFS4ERR_BADSESSION &&
status != -NFS4ERR_DEADSESSION) {
- nfs4_session_recovery_handle_error(clp, status);
+ status = nfs4_recovery_handle_error(clp, status);
goto out;
}
memset(clp->cl_session->sess_id.data, 0, NFS4_MAX_SESSIONID_LEN);
status = nfs4_proc_create_session(clp);
if (status)
- nfs4_session_recovery_handle_error(clp, status);
+ status = nfs4_recovery_handle_error(clp, status);
out:
/*