From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Thu, 10 Dec 2009 08:38:39 +0000 (+0100)
Subject: cfq: Remove wait_request flag when idle time is being deleted
X-Git-Tag: firefly_0821_release~9833^2~3656^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=554554f60ad619e1efab01897208bc320b81d9da;p=firefly-linux-kernel-4.4.55.git

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>
---

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);