From: NeilBrown Date: Tue, 7 Aug 2018 23:20:02 +0000 (+1000) Subject: NFS: Use an appropriate work queue for direct-write completion X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46483c2ea4664679130d6489112f180c2bfc801d;p=linux.git 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 Signed-off-by: Anna Schumaker --- diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 621c517b325c6..aa12c3063baec 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)