summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorJeff Layton2015-11-19 20:30:26 +0100
committerTrond Myklebust2015-11-24 03:57:44 +0100
commit91ab4b4d16e6649fbbf65f303c0c4e20ed680bd1 (patch)
tree14ddd8ebe52a5edbaf0a8b4db8fc73a5b368de78 /fs/nfs/nfs4proc.c
parentNFS4: Cleanup FATTR4_WORD0_FS_LOCATIONS after decoding success (diff)
downloadkernel-qcow2-linux-91ab4b4d16e6649fbbf65f303c0c4e20ed680bd1.tar.gz
kernel-qcow2-linux-91ab4b4d16e6649fbbf65f303c0c4e20ed680bd1.tar.xz
kernel-qcow2-linux-91ab4b4d16e6649fbbf65f303c0c4e20ed680bd1.zip
nfs: use sliding delay when LAYOUTGET gets NFS4ERR_DELAY
When LAYOUTGET gets NFS4ERR_DELAY, we currently will wait 15s before retrying the call. That is a _very_ long time, so add a timeout value to struct nfs4_layoutget and pass nfs4_async_handle_error a pointer to it. This allows the RPC engine to use a sliding delay window, instead of a 15s delay. Signed-off-by: Jeff Layton <jeff.layton@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 765a03559363..89818036f035 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7866,7 +7866,7 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
spin_unlock(&inode->i_lock);
goto out_restart;
}
- if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN)
+ if (nfs4_async_handle_error(task, server, state, &lgp->timeout) == -EAGAIN)
goto out_restart;
out:
dprintk("<-- %s\n", __func__);