From 279d6ab76d520cd94f2c5bc890b3616870f9b341 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 31 Oct 2006 14:21:55 +0100
Subject: [PATCH] --- yaml --- r: 40551 b: refs/heads/master c:
 5fccbf61be2a7f32d2002b04afca4c5009612a58 h: refs/heads/master i:   40549:
 380c5f2d7ce023885c66cacf453077e27127de5c   40547:
 1e9ade923b294c272b662fde27f33444322b06b0   40543:
 e08c1ab53a858fcf9da57d24c3e4ebb0afd03650 v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9bad4f5107bb..b2140390a0ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eafa6cb18ec7e5424ce54017b5ce6d11dff58b79
+refs/heads/master: 5fccbf61be2a7f32d2002b04afca4c5009612a58
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 25c4e7ed0d00..1d9c3c70a9a0 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -456,6 +456,9 @@ static void cfq_add_rq_rb(struct request *rq)
 	 */
 	while ((__alias = elv_rb_add(&cfqq->sort_list, rq)) != NULL)
 		cfq_dispatch_insert(cfqd->queue, __alias);
+
+	if (!cfq_cfqq_on_rr(cfqq))
+		cfq_add_cfqq_rr(cfqd, cfqq);
 }
 
 static inline void
@@ -1652,9 +1655,6 @@ static void cfq_insert_request(request_queue_t *q, struct request *rq)
 
 	cfq_add_rq_rb(rq);
 
-	if (!cfq_cfqq_on_rr(cfqq))
-		cfq_add_cfqq_rr(cfqd, cfqq);
-
 	list_add_tail(&rq->queuelist, &cfqq->fifo);
 
 	cfq_rq_enqueued(cfqd, cfqq, rq);