diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-01-30 13:04:10 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-02-06 04:33:51 +0000 |
| commit | 78e3ae2d57c0df313b079a07f6ffc16e4041e56c (patch) | |
| tree | d32b647a33b525da498b5de93b25dc9083bce770 /fs/nfs | |
| parent | 8e61814f416e0069dbcedbe15509c0a5b5af9da6 (diff) | |
| download | kernel_samsung_smdk4412-78e3ae2d57c0df313b079a07f6ffc16e4041e56c.zip kernel_samsung_smdk4412-78e3ae2d57c0df313b079a07f6ffc16e4041e56c.tar.gz kernel_samsung_smdk4412-78e3ae2d57c0df313b079a07f6ffc16e4041e56c.tar.bz2 | |
NFSv4.1: Handle NFS4ERR_DELAY when resetting the NFSv4.1 session
commit c489ee290bdbbace6bb63ebe6ebd4dd605819495 upstream.
NFS4ERR_DELAY is a legal reply when we call DESTROY_SESSION. It
usually means that the server is busy handling an unfinished RPC
request. Just sleep for a second and then retry.
We also need to be able to handle the NFS4ERR_BACK_CHAN_BUSY return
value. If the NFS server has outstanding callbacks, we just want to
similarly sleep & retry.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4state.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 07354b7..b2e1136 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1583,8 +1583,18 @@ static int nfs4_reset_session(struct nfs_client *clp) nfs4_begin_drain_session(clp); status = nfs4_proc_destroy_session(clp->cl_session); - if (status && status != -NFS4ERR_BADSESSION && - status != -NFS4ERR_DEADSESSION) { + switch (status) { + case 0: + case -NFS4ERR_BADSESSION: + case -NFS4ERR_DEADSESSION: + break; + case -NFS4ERR_BACK_CHAN_BUSY: + case -NFS4ERR_DELAY: + set_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); + status = 0; + ssleep(1); + goto out; + default: status = nfs4_recovery_handle_error(clp, status); goto out; } |