dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: check that there is a plug in blk_flush_plug

Browse Source 
Rename blk_flush_plug to __blk_flush_plug and add a wrapper that includes
the NULL check instead of open coding that check everywhere.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220127070549.1377856-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig
2022-02-02 07:50:00 -07:00
committed by Jens Axboe
parent b1f866b013
commit aa8dcccaf3
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sched/core.c
+2 -5
View File
@@ -6344,8 +6344,7 @@ static inline void sched_submit_work(struct task_struct *tsk)
* If we are going to sleep and we have plugged IO queued,
* make sure to submit it to avoid deadlocks.
*/
if (tsk->plug)
blk_flush_plug(tsk->plug, true);
blk_flush_plug(tsk->plug, true);
}
static void sched_update_worker(struct task_struct *tsk)
@@ -8371,9 +8370,7 @@ int io_schedule_prepare(void)
int old_iowait = current->in_iowait;
current->in_iowait = 1;
if (current->plug)
blk_flush_plug(current->plug, true);
blk_flush_plug(current->plug, true);
return old_iowait;
}