diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-03-07 09:40:21 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-07 09:40:21 +0100 |
| commit | b873c5d692d4d5453cceed18bb06c62bb1a73ac0 (patch) | |
| tree | f9d5816bc26ced37f187a141ee6c74c7b8e00fcf /block/cfq-iosched.c | |
| parent | a60327107b56573c305ecc78e471dbdbb4d2f426 (diff) | |
| parent | e83a46bbb1d4c03defd733a64b727632a40059ad (diff) | |
| download | lwn-b873c5d692d4d5453cceed18bb06c62bb1a73ac0.tar.gz lwn-b873c5d692d4d5453cceed18bb06c62bb1a73ac0.zip | |
Merge branch 'block-for-2.6.39-core' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.39/core
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 938ae52aa927..9697053f80bc 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -3344,7 +3344,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, cfqd->busy_queues > 1) { cfq_del_timer(cfqd, cfqq); cfq_clear_cfqq_wait_request(cfqq); - __blk_run_queue(cfqd->queue); + __blk_run_queue(cfqd->queue, false); } else { cfq_blkiocg_update_idle_time_stats( &cfqq->cfqg->blkg); @@ -3359,7 +3359,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, * this new queue is RT and the current one is BE */ cfq_preempt_queue(cfqd, cfqq); - __blk_run_queue(cfqd->queue); + __blk_run_queue(cfqd->queue, false); } } @@ -3719,7 +3719,7 @@ static void cfq_kick_queue(struct work_struct *work) struct request_queue *q = cfqd->queue; spin_lock_irq(q->queue_lock); - __blk_run_queue(cfqd->queue); + __blk_run_queue(cfqd->queue, false); spin_unlock_irq(q->queue_lock); } |