1 files changed, 7 insertions, 48 deletions

diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0e34c7024195..e46a1fc6c1fe 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -932,60 +932,18 @@ static int flush_task_priority(int how)
         return RPC_PRIORITY_NORMAL;
 }
 
-int nfs_initiate_write(struct rpc_clnt *clnt,
-                       struct nfs_pgio_data *data,
-                       const struct rpc_call_ops *call_ops,
-                       int how, int flags)
+static void nfs_initiate_write(struct nfs_pgio_data *data, struct rpc_message *msg,
+                               struct rpc_task_setup *task_setup_data, int how)
 {
         struct inode *inode = data->header->inode;
         int priority = flush_task_priority(how);
-        struct rpc_task *task;
-        struct rpc_message msg = {
-                .rpc_argp = &data->args,
-                .rpc_resp = &data->res,
-                .rpc_cred = data->header->cred,
-        };
-        struct rpc_task_setup task_setup_data = {
-                .rpc_client = clnt,
-                .task = &data->task,
-                .rpc_message = &msg,
-                .callback_ops = call_ops,
-                .callback_data = data,
-                .workqueue = nfsiod_workqueue,
-                .flags = RPC_TASK_ASYNC | flags,
-                .priority = priority,
-        };
-        int ret = 0;
 
-        /* Set up the initial task struct.  */
-        NFS_PROTO(inode)->write_setup(data, &msg);
-
-        dprintk("NFS: %5u initiated write call "
-                "(req %s/%llu, %u bytes @ offset %llu)\n",
-                data->task.tk_pid,
-                inode->i_sb->s_id,
-                (unsigned long long)NFS_FILEID(inode),
-                data->args.count,
-                (unsigned long long)data->args.offset);
+        task_setup_data->priority = priority;
+        NFS_PROTO(inode)->write_setup(data, msg);
 
         nfs4_state_protect_write(NFS_SERVER(inode)->nfs_client,
-                                 &task_setup_data.rpc_client, &msg, data);
-
-        task = rpc_run_task(&task_setup_data);
-        if (IS_ERR(task)) {
-                ret = PTR_ERR(task);
-                goto out;
-        }
-        if (how & FLUSH_SYNC) {
-                ret = rpc_wait_for_completion_task(task);
-                if (ret == 0)
-                        ret = task->tk_status;
-        }
-        rpc_put_task(task);
-out:
-        return ret;
+                                 &task_setup_data->rpc_client, msg, data);
 }
-EXPORT_SYMBOL_GPL(nfs_initiate_write);
 
 static int nfs_do_write(struct nfs_pgio_data *data,
                 const struct rpc_call_ops *call_ops,
@@ -993,7 +951,7 @@ static int nfs_do_write(struct nfs_pgio_data *data,
 {
         struct inode *inode = data->header->inode;
 
-        return nfs_initiate_write(NFS_CLIENT(inode), data, call_ops, how, 0);
+        return nfs_initiate_pgio(NFS_CLIENT(inode), data, call_ops, how, 0);
 }
 
 static int nfs_do_multiple_writes(struct list_head *head,
@@ -1743,4 +1701,5 @@ static const struct nfs_rw_ops nfs_rw_write_ops = {
         .rw_release             = nfs_writeback_release_common,
         .rw_done                = nfs_writeback_done,
         .rw_result              = nfs_writeback_result,
+        .rw_initiate            = nfs_initiate_write,
 };