summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Strepp <wstrepp@gmx.de>2009-06-17 02:34:13 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 06:47:56 +0400
commit4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee (patch)
treef49edd4acf4963eb3377fd3a700982081970ba14
parent4c60117811171d867d4f27f17ea07d7419d45dae (diff)
downloadlinux-4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee.tar.xz
rb_tree: remove redundant if()-condition in rb_erase()
Furthermore, notice that the initial checks: if (!node->rb_left) child = node->rb_right; else if (!node->rb_right) child = node->rb_left; else { ... } guarantee that old->rb_right is set in the final else branch, therefore we can omit checking that again. Signed-off-by: Wolfram Strepp <wstrepp@gmx.de> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/rbtree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c
index 4b4b29b4577d..e2aa3be29858 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -250,15 +250,15 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
if (child)
rb_set_parent(child, parent);
parent->rb_left = child;
+
+ node->rb_right = old->rb_right;
+ rb_set_parent(old->rb_right, node);
}
node->rb_parent_color = old->rb_parent_color;
- node->rb_right = old->rb_right;
node->rb_left = old->rb_left;
-
rb_set_parent(old->rb_left, node);
- if (old->rb_right)
- rb_set_parent(old->rb_right, node);
+
goto color;
}