4 files changed, 13 insertions, 0 deletions

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index e0170407a885..e44200579c8d 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -280,6 +280,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq,
                 .rpc_client = NFS_CLIENT(inode),
                 .rpc_message = &msg,
                 .callback_ops = &nfs_read_direct_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         unsigned int pgbase;
@@ -446,6 +447,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
         struct rpc_task_setup task_setup_data = {
                 .rpc_client = NFS_CLIENT(inode),
                 .callback_ops = &nfs_write_direct_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
 
@@ -537,6 +539,7 @@ static void nfs_direct_commit_schedule(struct nfs_direct_req *dreq)
                 .rpc_message = &msg,
                 .callback_ops = &nfs_commit_direct_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
 
@@ -683,6 +686,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_direct_req *dreq,
                 .rpc_client = NFS_CLIENT(inode),
                 .rpc_message = &msg,
                 .callback_ops = &nfs_write_direct_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         size_t wsize = NFS_SERVER(inode)->wsize;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 7ce07862c2fb..b6db833f33e6 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -51,6 +51,7 @@
 
 #include "nfs4_fs.h"
 #include "delegation.h"
+#include "internal.h"
 #include "iostat.h"
 
 #define NFSDBG_FACILITY         NFSDBG_PROC
@@ -773,6 +774,7 @@ static int _nfs4_proc_open_confirm(struct nfs4_opendata *data)
                 .rpc_message = &msg,
                 .callback_ops = &nfs4_open_confirm_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         int status;
@@ -910,6 +912,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
                 .rpc_message = &msg,
                 .callback_ops = &nfs4_open_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         int status;
@@ -1315,6 +1318,7 @@ int nfs4_do_close(struct path *path, struct nfs4_state *state, int wait)
                 .rpc_client = server->client,
                 .rpc_message = &msg,
                 .callback_ops = &nfs4_close_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         int status = -ENOMEM;
@@ -3235,6 +3239,7 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,
                 .rpc_client = NFS_CLIENT(lsp->ls_state->inode),
                 .rpc_message = &msg,
                 .callback_ops = &nfs4_locku_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
 
@@ -3419,6 +3424,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f
                 .rpc_client = NFS_CLIENT(state->inode),
                 .rpc_message = &msg,
                 .callback_ops = &nfs4_lock_ops,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC,
         };
         int ret;
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index fab0d3720a03..87546cd277d5 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -177,6 +177,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
                 .rpc_message = &msg,
                 .callback_ops = call_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = RPC_TASK_ASYNC | swap_flags,
         };
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 69b4158d9a10..84495ef90728 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -803,6 +803,7 @@ static void nfs_write_rpcsetup(struct nfs_page *req,
                 .rpc_message = &msg,
                 .callback_ops = call_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = flags,
                 .priority = priority,
         };
@@ -1187,6 +1188,7 @@ static void nfs_commit_rpcsetup(struct list_head *head,
                 .rpc_message = &msg,
                 .callback_ops = &nfs_commit_ops,
                 .callback_data = data,
+                .workqueue = nfsiod_workqueue,
                 .flags = flags,
                 .priority = priority,
         };