Просмотр исходного кода

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>
Jeff Layton 9 лет назад
Родитель
Сommit
91ab4b4d16
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      fs/nfs/nfs4proc.c
  2. 1 0
      include/linux/nfs_xdr.h

+ 1 - 1
fs/nfs/nfs4proc.c

@@ -7866,7 +7866,7 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
 			spin_unlock(&inode->i_lock);
 			spin_unlock(&inode->i_lock);
 		goto out_restart;
 		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;
 		goto out_restart;
 out:
 out:
 	dprintk("<-- %s\n", __func__);
 	dprintk("<-- %s\n", __func__);

+ 1 - 0
include/linux/nfs_xdr.h

@@ -251,6 +251,7 @@ struct nfs4_layoutget {
 	struct nfs4_layoutget_res res;
 	struct nfs4_layoutget_res res;
 	struct rpc_cred *cred;
 	struct rpc_cred *cred;
 	gfp_t gfp_flags;
 	gfp_t gfp_flags;
+	long timeout;
 };
 };
 
 
 struct nfs4_getdeviceinfo_args {
 struct nfs4_getdeviceinfo_args {