diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-22 15:15:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-22 15:15:30 -0700 |
| commit | 1c8df7bd48347a707b437cfd0dad6b08a3b89ab6 (patch) | |
| tree | 6b851006a791d0595061600b1685d4db7e85f1f7 /kernel | |
| parent | a30ec4b347192f65e811b0b165ef08fa1ba379c4 (diff) | |
| parent | 10d784eae2b41e25d8fc6a88096cd27286093c84 (diff) | |
| download | linux-1c8df7bd48347a707b437cfd0dad6b08a3b89ab6.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Three small fixes that have been picked up the last few weeks.
Specifically:
- Fix a memory corruption issue in NVMe with malignant user
constructed request. From Christoph.
- Kill (now) unused blk_queue_bio(), dm was changed to not need this
anymore. From Mike Snitzer.
- Always use blk_schedule_flush_plug() from the io_schedule() path
when flushing a plug, fixing a !TASK_RUNNING warning with md. From
Shaohua"
* 'for-linus' of git://git.kernel.dk/linux-block:
sched: always use blk_schedule_flush_plug in io_schedule_out
nvme: fix kernel memory corruption with short INQUIRY buffers
block: remove export for blk_queue_bio
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 57bd333bc4ab..123673291ffb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -4389,10 +4389,7 @@ long __sched io_schedule_timeout(long timeout) long ret; current->in_iowait = 1; - if (old_iowait) - blk_schedule_flush_plug(current); - else - blk_flush_plug(current); + blk_schedule_flush_plug(current); delayacct_blkio_start(); rq = raw_rq(); |