summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2012-10-03 16:57:00 -0400
committerTejun Heo <tj@kernel.org>2013-01-09 08:05:09 -0800
commit1f23f12151ab508728dd5fca12180e2fce6c6949 (patch)
treeebd8f061f62d381d9f346f4d720f0a6288143eb6
parent6d816ec7c83871da7c2472af7479d2438e641052 (diff)
downloadlinux-3.10-1f23f12151ab508728dd5fca12180e2fce6c6949.tar.gz
linux-3.10-1f23f12151ab508728dd5fca12180e2fce6c6949.tar.bz2
linux-3.10-1f23f12151ab508728dd5fca12180e2fce6c6949.zip
cfq-iosched: Get rid of unnecessary local variable
Use of local varibale "n" seems to be unnecessary. Remove it. This brings it inline with function __cfq_group_st_add(), which is also doing the similar operation of adding a group to a rb tree. No functionality change here. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Acked-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--block/cfq-iosched.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index e34e142b6db..5ad4cae1beb 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -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)