From 426304148dcf453051a33424b73462ebcd1ae50a Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Tue, 24 May 2011 10:23:22 +0200 Subject: [PATCH] --- yaml --- r: 251173 b: refs/heads/master c: 20359f27e8ff115f7cddf3da5b3a6cdcca2e650d h: refs/heads/master i: 251171: 18fe7ad0c02a501e625d6db60830346f5323f98c v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd9cb3e983f6..3c7298ca2b70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 229836bd63c5413a4f8eed93d610b432be141e9b +refs/heads/master: 20359f27e8ff115f7cddf3da5b3a6cdcca2e650d diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 7ffceddee420..6dd2179cf1a4 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -1279,7 +1279,6 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq, struct cfq_rb_root *service_tree; int left; int new_cfqq = 1; - int group_changed = 0; service_tree = service_tree_for(cfqq->cfqg, cfqq_prio(cfqq), cfqq_type(cfqq)); @@ -1350,7 +1349,7 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq, rb_link_node(&cfqq->rb_node, parent, p); rb_insert_color(&cfqq->rb_node, &service_tree->rb); service_tree->count++; - if ((add_front || !new_cfqq) && !group_changed) + if (add_front || !new_cfqq) return; cfq_group_notify_queue_add(cfqd, cfqq->cfqg); }