From 79bb843e477b6b5bf9c2d1bec74cdb6d964c24af Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Wed, 3 Oct 2012 16:57:00 -0400
Subject: [PATCH] --- yaml --- r: 359493 b: refs/heads/master c:
 1f23f12151ab508728dd5fca12180e2fce6c6949 h: refs/heads/master i:   359491:
 074115a2f14160baddc7453807327fb88716e0ba v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index c6644e1742c8..473991d2cf32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d816ec7c83871da7c2472af7479d2438e641052
+refs/heads/master: 1f23f12151ab508728dd5fca12180e2fce6c6949
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index e34e142b6dbb..5ad4cae1beb2 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/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)