aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2009-09-11 11:08:59 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-09-14 02:24:52 -0400
commit06d2188644c85c56d243efab914f368d1d23c4a3 (patch)
tree5ee4a4c5b6343a33573fac6a3a66015238e5b1d6
parenta9327cac440be4d8333bba975cbbf76045096275 (diff)
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>
-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 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)
1110 1110
1111 cfq_log_cfqq(cfqd, cfqq, "dispatch_insert"); 1111 cfq_log_cfqq(cfqd, cfqq, "dispatch_insert");
1112 1112
1113 cfqq->next_rq = cfq_find_next_rq(cfqd, cfqq, rq);
1113 cfq_remove_request(rq); 1114 cfq_remove_request(rq);
1114 cfqq->dispatched++; 1115 cfqq->dispatched++;
1115 elv_dispatch_sort(q, rq); 1116 elv_dispatch_sort(q, rq);