---

yaml --- r: 359493 b: refs/heads/master c: 1f23f12 h: refs/heads/master i: 359491: 074115a v: v3
git-mirror · Jan 9, 2013 · 79bb843 · 79bb843
1 parent 8e9ae14
commit 79bb843
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -1658,22 +1658,18 @@ 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);
 
 		/*
 		 * 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)