summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2009-09-11 17:08:59 +0200
committerJens Axboe <jens.axboe@oracle.com>2009-09-14 08:24:52 +0200
commit06d2188644c85c56d243efab914f368d1d23c4a3 (patch)
tree5ee4a4c5b6343a33573fac6a3a66015238e5b1d6 /block
parenta9327cac440be4d8333bba975cbbf76045096275 (diff)
downloadlinux-3.10-06d2188644c85c56d243efab914f368d1d23c4a3.tar.gz
linux-3.10-06d2188644c85c56d243efab914f368d1d23c4a3.tar.bz2
linux-3.10-06d2188644c85c56d243efab914f368d1d23c4a3.zip
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>
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 a34686f091d..0e3814b662a 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);