aboutsummaryrefslogtreecommitdiff
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2013-12-23 10:54:59 +0800
committerAlex Shi <alex.shi@linaro.org>2013-12-23 10:54:59 +0800
commitabc5c8153c473f352bbc6eccfb016564a1b58b7e (patch)
tree3d5b999e02a8136998d72eb60df923ed81793a69 /fs/nfs/nfs4proc.c
parent188c91c2f4c54d8265ed947886ec1bbcf8f24e99 (diff)
parent3c6556b1a9c2f9c91aacbc57bac938691fedda81 (diff)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 10a0dde7731..8e7ca22c606 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4222,8 +4222,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
dprintk("%s ERROR %d, Reset session\n", __func__,
task->tk_status);
nfs4_schedule_session_recovery(clp->cl_session, task->tk_status);
- task->tk_status = 0;
- return -EAGAIN;
+ goto wait_on_recovery;
#endif /* CONFIG_NFS_V4_1 */
case -NFS4ERR_DELAY:
nfs_inc_server_stats(server, NFSIOS_DELAY);