summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorGui Jianfeng <guijianfeng@cn.fujitsu.com>2009-12-10 11:38:39 +0300
committerJens Axboe <jens.axboe@oracle.com>2009-12-10 11:38:39 +0300
commit554554f60ad619e1efab01897208bc320b81d9da (patch)
treeb240b0e65dc763c6c2f7b5661f59ad4bcb0385b3 /block
parentedc71131c4dc6cc73e2a24aa0a7a79cfce738f12 (diff)
downloadlinux-554554f60ad619e1efab01897208bc320b81d9da.tar.xz
cfq: Remove wait_request flag when idle time is being deleted
Remove wait_request flag when idle time is being deleted, otherwise it'll hit this path every time when a request is enqueued. Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 69ecee7f4ad4..96f59ae5b6e9 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3202,6 +3202,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
if (blk_rq_bytes(rq) > PAGE_CACHE_SIZE ||
cfqd->busy_queues > 1) {
del_timer(&cfqd->idle_slice_timer);
+ cfq_clear_cfqq_wait_request(cfqq);
__blk_run_queue(cfqd->queue);
} else
cfq_mark_cfqq_must_dispatch(cfqq);