---

yaml --- r: 40551 b: refs/heads/master c: 5fccbf6 h: refs/heads/master i: 40549: 380c5f2 40547: 1e9ade9 40543: e08c1ab v: v3
git-mirror · Oct 31, 2006 · 279d6ab · 279d6ab
1 parent 102d2e1
commit 279d6ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);