diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2011-11-11 15:28:01 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2011-11-12 23:23:35 +0100 |
| commit | b8c5bdefcdb91babbc025e2936702ba19d7946a9 (patch) | |
| tree | 7ab03c9b84ba5f7956396e642bea32a17ff9ef2d /src/rbtree.c | |
| parent | 0395c6e7c4baceae4539e4a7ede9a4473c57a350 (diff) | |
core/rbtree: reorganize code in rb_erase() for additional changes
See kernel commit 16c047add3ceaf0ab882e3e094d1ec904d02312d
----
First, move some code around in order to make the next change more
obvious.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Wolfram Strepp <wstrepp@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'src/rbtree.c')
| -rw-r--r-- | src/rbtree.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/rbtree.c b/src/rbtree.c index d1c2f6b1..9db0641c 100644 --- a/src/rbtree.c +++ b/src/rbtree.c @@ -229,6 +229,15 @@ void rb_erase(struct rb_node *node, struct rb_root *root) node = node->rb_right; while ((left = node->rb_left) != NULL) node = left; + + if (rb_parent(old)) { + if (rb_parent(old)->rb_left == old) + rb_parent(old)->rb_left = node; + else + rb_parent(old)->rb_right = node; + } else + root->rb_node = node; + child = node->rb_right; parent = rb_parent(node); color = rb_color(node); @@ -245,15 +254,6 @@ void rb_erase(struct rb_node *node, struct rb_root *root) node->rb_right = old->rb_right; node->rb_left = old->rb_left; - if (rb_parent(old)) - { - if (rb_parent(old)->rb_left == old) - rb_parent(old)->rb_left = node; - else - rb_parent(old)->rb_right = node; - } else - root->rb_node = node; - rb_set_parent(old->rb_left, node); if (old->rb_right) rb_set_parent(old->rb_right, node); |