aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2018-08-08 09:20:02 +1000
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2018-08-08 17:07:38 -0400
commit46483c2ea4664679130d6489112f180c2bfc801d (patch)
tree4417e26e7713b54f319b4ce6f8712c99d07d7cd5 /fs/nfs/direct.c
parentNFSv4: Fix error handling in nfs4_sp4_select_mode() (diff)
downloadlinux-dev-46483c2ea4664679130d6489112f180c2bfc801d.tar.xz
linux-dev-46483c2ea4664679130d6489112f180c2bfc801d.zip
NFS: Use an appropriate work queue for direct-write completion
When a direct-write completes, a work_struct is schedule to handle the completion. When NFS is being used for swap, the direct write might be a swap-out, so memory allocation can block until the write completes. The work queue currently used is not WQ_MEM_RECLAIM, so tasks can block waiting for memory - this leads to deadlock. So use nfsiod_workqueue instead. This will always have a running thread, and work items should never block waiting for memory. Signed-off-by: Neil Brown <neilb@suse.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 621c517b325c..aa12c3063bae 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -758,7 +758,7 @@ static void nfs_direct_write_schedule_work(struct work_struct *work)
static void nfs_direct_write_complete(struct nfs_direct_req *dreq)
{
- schedule_work(&dreq->work); /* Calls nfs_direct_write_schedule_work */
+ queue_work(nfsiod_workqueue, &dreq->work); /* Calls nfs_direct_write_schedule_work */
}
static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)