diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:49:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:49:02 -0700 |
| commit | a2b9c1f6208126e6df6c02428c501f8853685812 (patch) | |
| tree | e36762d385bb490914a72485c4da4431e4b937d3 /block/blk-core.c | |
| parent | 2e9521fd656f05a716b5294a7dbebd37ced05e43 (diff) | |
| parent | 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blocklatest
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: don't delay blk_run_queue_async
scsi: remove performance regression due to async queue run
blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup
block: rescan partitions on invalidated devices on -ENOMEDIA too
cdrom: always check_disk_change() on open
block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index a2e58eeb3549..3fe00a14822a 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -316,8 +316,10 @@ EXPORT_SYMBOL(__blk_run_queue); */ void blk_run_queue_async(struct request_queue *q) { - if (likely(!blk_queue_stopped(q))) + if (likely(!blk_queue_stopped(q))) { + __cancel_delayed_work(&q->delay_work); queue_delayed_work(kblockd_workqueue, &q->delay_work, 0); + } } EXPORT_SYMBOL(blk_run_queue_async); |