dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

rbtree: break out of rb_insert_color loop after tree rotation 

It is a well known property of rbtrees that insertion never requires more
than two tree rotations.  In our implementation, after one loop iteration
identified one or two necessary tree rotations, we would iterate and look
for more.  However at that point the node's parent would always be black,
which would cause us to exit the loop.

We can make the code flow more obvious by just adding a break statement
after the tree rotations, where we know we are done.  Additionally, in the
cases where two tree rotations are necessary, we don't have to update the
'node' pointer as it wouldn't be used until the next loop iteration, which
we now avoid due to this break statement.

Signed-off-by: Michel Lespinasse <walken@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Daniel Santos <daniel.santos@pobox.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michel Lespinasse 2012-10-08 16:30:42 -07:00 committed by Linus Torvalds
parent 910a742d4b
commit 1f0528653e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rbtree.c
View File

@ -109,18 +109,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
}
}
if (parent->rb_right == node)
{
register struct rb_node *tmp;
if (parent->rb_right == node) {
__rb_rotate_left(parent, root);
tmp = parent;
parent = node;
node = tmp;
}
rb_set_black(parent);
rb_set_red(gparent);
__rb_rotate_right(gparent, root);
break;
} else {
{
register struct rb_node *uncle = gparent->rb_left;
@ -134,18 +131,15 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root)
}
}
if (parent->rb_left == node)
{
register struct rb_node *tmp;
if (parent->rb_left == node) {
__rb_rotate_right(parent, root);
tmp = parent;
parent = node;
node = tmp;
}
rb_set_black(parent);
rb_set_red(gparent);
__rb_rotate_left(gparent, root);
break;
}
}