aboutsummaryrefslogtreecommitdiff
path: root/lib/rbtree.c
diff options
context:
space:
mode:
authorWolfram Strepp <wstrepp@gmx.de>2009-06-16 15:34:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 19:47:56 -0700
commit16c047add3ceaf0ab882e3e094d1ec904d02312d (patch)
tree80702a25fc558bec68e3214048fd6f8301e7d17d /lib/rbtree.c
parent130b76cf5295d74a2174d0843bb563bbf0a19dbb (diff)
downloadlinux-2.6.34-ux500-16c047add3ceaf0ab882e3e094d1ec904d02312d.tar.gz
rb_tree: reorganize code in rb_erase() for additional changes
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>
Diffstat (limited to 'lib/rbtree.c')
-rw-r--r--lib/rbtree.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c
index f653659e0bc..0455685f6a7 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -231,6 +231,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);
@@ -247,15 +256,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);