rb_tree: reorganize code in rb_erase() for additional changes

First, move some code around in order to make the next change more obvious. [[email protected]: coding-style fixes] Signed-off-by: Peter Zijlstra <[email protected]> Signed-off-by: Wolfram Strepp <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
TechNexion · Jun 17, 2009 · 16c047a · 16c047a
1 parent 130b76c
commit 16c047a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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);