]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
NFS: Have nfs4_proc_get_lease_time() call nfs4_call_sync_custom()
authorAnna Schumaker <Anna.Schumaker@Netapp.com>
Mon, 19 Aug 2019 14:18:28 +0000 (10:18 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Thu, 22 Aug 2019 14:05:35 +0000 (10:05 -0400)
This removes some code duplication, since both functions were doing the
same thing.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4proc.c

index df12af8f6b363b776f31d660236ee528bd068bfc..00c7a92e3d6b18d6857507c624a6adf311002d7b 100644 (file)
@@ -8356,7 +8356,6 @@ static const struct rpc_call_ops nfs4_get_lease_time_ops = {
 
 int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
 {
-       struct rpc_task *task;
        struct nfs4_get_lease_time_args args;
        struct nfs4_get_lease_time_res res = {
                .lr_fsinfo = fsinfo,
@@ -8378,17 +8377,9 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo)
                .callback_data = &data,
                .flags = RPC_TASK_TIMEOUT,
        };
-       int status;
 
        nfs4_init_sequence(&args.la_seq_args, &res.lr_seq_res, 0, 1);
-       task = rpc_run_task(&task_setup);
-
-       if (IS_ERR(task))
-               return PTR_ERR(task);
-
-       status = task->tk_status;
-       rpc_put_task(task);
-       return status;
+       return nfs4_call_sync_custom(&task_setup);
 }
 
 #ifdef CONFIG_NFS_V4_1