leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[RBTREE] Remove dead code in rb_erase()

Browse Source 
Observe rb_erase(), when the victim node 'old' has two children so
neither of the simple cases at the beginning are taken.

Observe that it effectively does an 'rb_next()' operation to find the
next (by value) node in the tree. That is; we go to the victim's
right-hand child and then follow left-hand pointers all the way
down the tree as far as we can until we find the next node 'node'. We
end up with 'node' being either the same immediate right-hand child of
'old', or one of its descendants on the far left-hand side.

For a start, we _know_ that 'node' has a parent. We can drop that check.

We also know that if 'node's parent is 'old', then 'node' is the
right-hand child of its parent. And that if 'node's parent is _not_
'old', then 'node' is the left-hand child of its parent.

So instead of checking for 'node->rb_parent == old' in one place and
also checking 'node's heritage separately when we're trying to change
its link from its parent, we can shuffle things around a bit and do
it like this...

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse 2006-04-21 13:30:36 +01:00
parent 21f1d5fc59
commit 1975e59375
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rbtree.c
View File

@ -243,18 +243,13 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
if (child) if (child)
child->rb_parent = parent; child->rb_parent = parent;
if (parent)
{
if (parent->rb_left == node)
parent->rb_left = child;
else
parent->rb_right = child;
}
else
root->rb_node = child;
if (node->rb_parent == old) if (node->rb_parent == old) {
parent->rb_right = child;
parent = node; parent = node;
} else
parent->rb_left = child;
node->rb_parent = old->rb_parent; node->rb_parent = old->rb_parent;
node->rb_color = old->rb_color; node->rb_color = old->rb_color;
node->rb_right = old->rb_right; node->rb_right = old->rb_right;