diff options
| author | Trond Myklebust | 2012-05-27 19:02:53 +0200 |
|---|---|---|
| committer | Trond Myklebust | 2012-05-27 20:33:07 +0200 |
| commit | 9f594791dd530c2dc06953fb32505a26cc28371f (patch) | |
| tree | 3e981af095a51a354bb1c1d281136e1889a125c9 /fs/nfs/nfs4state.c | |
| parent | NFSv4.1: Handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION in the state manager (diff) | |
| download | kernel-qcow2-linux-9f594791dd530c2dc06953fb32505a26cc28371f.tar.gz kernel-qcow2-linux-9f594791dd530c2dc06953fb32505a26cc28371f.tar.xz kernel-qcow2-linux-9f594791dd530c2dc06953fb32505a26cc28371f.zip | |
NFSv4.1: Handle other occurrences of NFS4ERR_CONN_NOT_BOUND_TO_SESSION
Let nfs4_schedule_session_recovery() handle the details of choosing
between resetting the session, and other session related recovery.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4state.c')
| -rw-r--r-- | fs/nfs/nfs4state.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index e593ae972567..d46a905b07ae 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1635,11 +1635,17 @@ static int nfs4_reclaim_lease(struct nfs_client *clp) } #ifdef CONFIG_NFS_V4_1 -void nfs4_schedule_session_recovery(struct nfs4_session *session) +void nfs4_schedule_session_recovery(struct nfs4_session *session, int err) { struct nfs_client *clp = session->clp; - set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); + switch (err) { + default: + set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); + break; + case -NFS4ERR_CONN_NOT_BOUND_TO_SESSION: + set_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state); + } nfs4_schedule_lease_recovery(clp); } EXPORT_SYMBOL_GPL(nfs4_schedule_session_recovery); |