Commit 4b324126 authored Jun 16, 2009 by Wolfram Strepp Committed by Linus Torvalds Jun 16, 2009

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>

parent 4c601178

lib/rbtree.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message