Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91ab4b4d authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

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: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f54423a1

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -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__);

include/linux/nfs_xdr.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ struct nfs4_layoutget { 
	struct nfs4_layoutget_res res;

	struct rpc_cred *cred;

	gfp_t gfp_flags;

	long timeout;

};



struct nfs4_getdeviceinfo_args {