NFSv4.1: Simplify the sequence setup

Nobody calls nfs4_setup_sequence or nfs41_setup_sequence without
also calling rpc_call_start() on success. This commit therefore
folds the rpc_call_start call into nfs41_setup_sequence().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 12 insertions, 18 deletions

diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index 591a1a7f8f9..1e42413fab8 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -307,12 +307,10 @@ static void filelayout_read_prepare(struct rpc_task *task, void *data)
         }
         rdata->read_done_cb = filelayout_read_done_cb;
 
-        if (nfs41_setup_sequence(rdata->ds_clp->cl_session,
-                                &rdata->args.seq_args, &rdata->res.seq_res,
-                                task))
-                return;
-
-        rpc_call_start(task);
+        nfs41_setup_sequence(rdata->ds_clp->cl_session,
+                        &rdata->args.seq_args,
+                        &rdata->res.seq_res,
+                        task);
 }
 
 static void filelayout_read_call_done(struct rpc_task *task, void *data)
@@ -409,12 +407,10 @@ static void filelayout_write_prepare(struct rpc_task *task, void *data)
                 rpc_exit(task, 0);
                 return;
         }
-        if (nfs41_setup_sequence(wdata->ds_clp->cl_session,
-                                &wdata->args.seq_args, &wdata->res.seq_res,
-                                task))
-                return;
-
-        rpc_call_start(task);
+        nfs41_setup_sequence(wdata->ds_clp->cl_session,
+                        &wdata->args.seq_args,
+                        &wdata->res.seq_res,
+                        task);
 }
 
 static void filelayout_write_call_done(struct rpc_task *task, void *data)
@@ -450,12 +446,10 @@ static void filelayout_commit_prepare(struct rpc_task *task, void *data)
 {
         struct nfs_commit_data *wdata = data;
 
-        if (nfs41_setup_sequence(wdata->ds_clp->cl_session,
-                                &wdata->args.seq_args, &wdata->res.seq_res,
-                                task))
-                return;
-
-        rpc_call_start(task);
+        nfs41_setup_sequence(wdata->ds_clp->cl_session,
+                        &wdata->args.seq_args,
+                        &wdata->res.seq_res,
+                        task);
 }
 
 static void filelayout_write_commit_done(struct rpc_task *task, void *data)