aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b358ec1d171..e89940a2819 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3386,7 +3386,7 @@ static const struct rpc_call_ops nfs4_renew_ops = {
3386 .rpc_release = nfs4_renew_release, 3386 .rpc_release = nfs4_renew_release,
3387}; 3387};
3388 3388
3389static int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred) 3389static int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred, unsigned renew_flags)
3390{ 3390{
3391 struct rpc_message msg = { 3391 struct rpc_message msg = {
3392 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW], 3392 .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_RENEW],
@@ -3395,6 +3395,8 @@ static int nfs4_proc_async_renew(struct nfs_client *clp, struct rpc_cred *cred)
3395 }; 3395 };
3396 struct nfs4_renewdata *data; 3396 struct nfs4_renewdata *data;
3397 3397
3398 if (renew_flags == 0)
3399 return 0;
3398 if (!atomic_inc_not_zero(&clp->cl_count)) 3400 if (!atomic_inc_not_zero(&clp->cl_count))
3399 return -EIO; 3401 return -EIO;
3400 data = kmalloc(sizeof(*data), GFP_NOFS); 3402 data = kmalloc(sizeof(*data), GFP_NOFS);
@@ -5504,11 +5506,13 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, struct rpc_
5504 return rpc_run_task(&task_setup_data); 5506 return rpc_run_task(&task_setup_data);
5505} 5507}
5506 5508
5507static int nfs41_proc_async_sequence(struct nfs_client *clp, struct rpc_cred *cred) 5509static int nfs41_proc_async_sequence(struct nfs_client *clp, struct rpc_cred *cred, unsigned renew_flags)
5508{ 5510{
5509 struct rpc_task *task; 5511 struct rpc_task *task;
5510 int ret = 0; 5512 int ret = 0;
5511 5513
5514 if ((renew_flags & NFS4_RENEW_TIMEOUT) == 0)
5515 return 0;
5512 task = _nfs41_proc_sequence(clp, cred); 5516 task = _nfs41_proc_sequence(clp, cred);
5513 if (IS_ERR(task)) 5517 if (IS_ERR(task))
5514 ret = PTR_ERR(task); 5518 ret = PTR_ERR(task);