1 files changed, 12 insertions, 28 deletions

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 0ca4af8cca5d..cc9064974104 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1384,30 +1384,14 @@ static void ff_layout_read_prepare_v3(struct rpc_task *task, void *data)
         rpc_call_start(task);
 }
 
-static int ff_layout_setup_sequence(struct nfs_client *ds_clp,
-                                    struct nfs4_sequence_args *args,
-                                    struct nfs4_sequence_res *res,
-                                    struct rpc_task *task)
-{
-        if (ds_clp->cl_session)
-                return nfs41_setup_sequence(ds_clp->cl_session,
-                                           args,
-                                           res,
-                                           task);
-        return nfs40_setup_sequence(ds_clp->cl_slot_tbl,
-                                   args,
-                                   res,
-                                   task);
-}
-
 static void ff_layout_read_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_pgio_header *hdr = data;
 
-        if (ff_layout_setup_sequence(hdr->ds_clp,
-                                     &hdr->args.seq_args,
-                                     &hdr->res.seq_res,
-                                     task))
+        if (nfs4_setup_sequence(hdr->ds_clp,
+                                &hdr->args.seq_args,
+                                &hdr->res.seq_res,
+                                task))
                 return;
 
         if (ff_layout_read_prepare_common(task, hdr))
@@ -1578,10 +1562,10 @@ static void ff_layout_write_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_pgio_header *hdr = data;
 
-        if (ff_layout_setup_sequence(hdr->ds_clp,
-                                     &hdr->args.seq_args,
-                                     &hdr->res.seq_res,
-                                     task))
+        if (nfs4_setup_sequence(hdr->ds_clp,
+                                &hdr->args.seq_args,
+                                &hdr->res.seq_res,
+                                task))
                 return;
 
         if (ff_layout_write_prepare_common(task, hdr))
@@ -1667,10 +1651,10 @@ static void ff_layout_commit_prepare_v4(struct rpc_task *task, void *data)
 {
         struct nfs_commit_data *wdata = data;
 
-        if (ff_layout_setup_sequence(wdata->ds_clp,
-                                 &wdata->args.seq_args,
-                                 &wdata->res.seq_res,
-                                 task))
+        if (nfs4_setup_sequence(wdata->ds_clp,
+                                &wdata->args.seq_args,
+                                &wdata->res.seq_res,
+                                task))
                 return;
         ff_layout_commit_prepare_common(task, data);
 }