diff options
author | Wolfram Strepp <wstrepp@gmx.de> | 2009-06-16 15:34:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 19:47:56 -0700 |
commit | 4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee (patch) | |
tree | f49edd4acf4963eb3377fd3a700982081970ba14 | |
parent | 4c60117811171d867d4f27f17ea07d7419d45dae (diff) | |
download | kernel_samsung_smdk4412-4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee.zip kernel_samsung_smdk4412-4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee.tar.gz kernel_samsung_smdk4412-4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee.tar.bz2 |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c index 4b4b29b..e2aa3be 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; } |