From: Jeff Moyer <jmoyer@redhat.com>
Date: Fri, 11 Sep 2009 15:08:59 +0000 (+0200)
Subject: cfq: choose a new next_req when a request is dispatched
X-Git-Tag: v2.6.32-rc1~688^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=06d2188644c85c56d243efab914f368d1d23c4a3;p=linux-block.git

cfq: choose a new next_req when a request is dispatched

This patch addresses http://bugzilla.kernel.org/show_bug.cgi?id=13401, a
regression introduced in 2.6.30.

From the bug report:

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index a34686f091db..0e3814b662af 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1110,6 +1110,7 @@ static void cfq_dispatch_insert(struct request_queue *q, struct request *rq)
 
 	cfq_log_cfqq(cfqd, cfqq, "dispatch_insert");
 
+	cfqq->next_rq = cfq_find_next_rq(cfqd, cfqq, rq);
 	cfq_remove_request(rq);
 	cfqq->dispatched++;
 	elv_dispatch_sort(q, rq);