aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rbtree.c
diff options
context:
space:
mode:
authorWolfram Strepp <wstrepp@gmx.de>2009-06-16 18:34:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 22:47:56 -0400
commit16c047add3ceaf0ab882e3e094d1ec904d02312d (patch)
tree80702a25fc558bec68e3214048fd6f8301e7d17d /lib/rbtree.c
parent130b76cf5295d74a2174d0843bb563bbf0a19dbb (diff)
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 f653659e0bc1..0455685f6a73 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -231,6 +231,15 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
231 node = node->rb_right; 231 node = node->rb_right;
232 while ((left = node->rb_left) != NULL) 232 while ((left = node->rb_left) != NULL)
233 node = left; 233 node = left;
234
235 if (rb_parent(old)) {
236 if (rb_parent(old)->rb_left == old)
237 rb_parent(old)->rb_left = node;
238 else
239 rb_parent(old)->rb_right = node;
240 } else
241 root->rb_node = node;
242
234 child = node->rb_right; 243 child = node->rb_right;
235 parent = rb_parent(node); 244 parent = rb_parent(node);
236 color = rb_color(node); 245 color = rb_color(node);
@@ -247,15 +256,6 @@ void rb_erase(struct rb_node *node, struct rb_root *root)
247 node->rb_right = old->rb_right; 256 node->rb_right = old->rb_right;
248 node->rb_left = old->rb_left; 257 node->rb_left = old->rb_left;
249 258
250 if (rb_parent(old))
251 {
252 if (rb_parent(old)->rb_left == old)
253 rb_parent(old)->rb_left = node;
254 else
255 rb_parent(old)->rb_right = node;
256 } else
257 root->rb_node = node;
258
259 rb_set_parent(old->rb_left, node); 259 rb_set_parent(old->rb_left, node);
260 if (old->rb_right) 260 if (old->rb_right)
261 rb_set_parent(old->rb_right, node); 261 rb_set_parent(old->rb_right, node);