aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/cfq-iosched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 7ffceddee420..6dd2179cf1a4 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1279,7 +1279,6 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq,
1279 struct cfq_rb_root *service_tree; 1279 struct cfq_rb_root *service_tree;
1280 int left; 1280 int left;
1281 int new_cfqq = 1; 1281 int new_cfqq = 1;
1282 int group_changed = 0;
1283 1282
1284 service_tree = service_tree_for(cfqq->cfqg, cfqq_prio(cfqq), 1283 service_tree = service_tree_for(cfqq->cfqg, cfqq_prio(cfqq),
1285 cfqq_type(cfqq)); 1284 cfqq_type(cfqq));
@@ -1350,7 +1349,7 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq,
1350 rb_link_node(&cfqq->rb_node, parent, p); 1349 rb_link_node(&cfqq->rb_node, parent, p);
1351 rb_insert_color(&cfqq->rb_node, &service_tree->rb); 1350 rb_insert_color(&cfqq->rb_node, &service_tree->rb);
1352 service_tree->count++; 1351 service_tree->count++;
1353 if ((add_front || !new_cfqq) && !group_changed) 1352 if (add_front || !new_cfqq)
1354 return; 1353 return;
1355 cfq_group_notify_queue_add(cfqd, cfqq->cfqg); 1354 cfq_group_notify_queue_add(cfqd, cfqq->cfqg);
1356} 1355}