aboutsummaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 7c52d6888924..a2fb14bb1402 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1501,16 +1501,11 @@ static void cfq_add_rq_rb(struct request *rq)
1501{ 1501{
1502 struct cfq_queue *cfqq = RQ_CFQQ(rq); 1502 struct cfq_queue *cfqq = RQ_CFQQ(rq);
1503 struct cfq_data *cfqd = cfqq->cfqd; 1503 struct cfq_data *cfqd = cfqq->cfqd;
1504 struct request *__alias, *prev; 1504 struct request *prev;
1505 1505
1506 cfqq->queued[rq_is_sync(rq)]++; 1506 cfqq->queued[rq_is_sync(rq)]++;
1507 1507
1508 /* 1508 elv_rb_add(&cfqq->sort_list, rq);
1509 * looks a little odd, but the first insert might return an alias.
1510 * if that happens, put the alias on the dispatch list
1511 */
1512 while ((__alias = elv_rb_add(&cfqq->sort_list, rq)) != NULL)
1513 cfq_dispatch_insert(cfqd->queue, __alias);
1514 1509
1515 if (!cfq_cfqq_on_rr(cfqq)) 1510 if (!cfq_cfqq_on_rr(cfqq))
1516 cfq_add_cfqq_rr(cfqd, cfqq); 1511 cfq_add_cfqq_rr(cfqd, cfqq);