|
@@ -1658,8 +1658,6 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq,
|
|
|
cfqq->service_tree = st;
|
|
|
p = &st->rb.rb_node;
|
|
|
while (*p) {
|
|
|
- struct rb_node **n;
|
|
|
-
|
|
|
parent = *p;
|
|
|
__cfqq = rb_entry(parent, struct cfq_queue, rb_node);
|
|
|
|
|
@@ -1667,13 +1665,11 @@ static void cfq_service_tree_add(struct cfq_data *cfqd, struct cfq_queue *cfqq,
|
|
|
* sort by key, that represents service time.
|
|
|
*/
|
|
|
if (time_before(rb_key, __cfqq->rb_key))
|
|
|
- n = &(*p)->rb_left;
|
|
|
+ p = &parent->rb_left;
|
|
|
else {
|
|
|
- n = &(*p)->rb_right;
|
|
|
+ p = &parent->rb_right;
|
|
|
left = 0;
|
|
|
}
|
|
|
-
|
|
|
- p = n;
|
|
|
}
|
|
|
|
|
|
if (left)
|