[PATCH -tip] rbtree: avoid func twice when node doesn't have a right sibling

[Xiaotian Feng]

In rb_augment_path(),

        if (node == parent->rb_left && parent->rb_right)
                func(parent->rb_right, data);
        else if (parent->rb_left)
                func(parent->rb_left, data);

If (node == parent->rb_left && !parent->rb_right), then kernel will
func(node,data) twice.

Signed-off-by: Xiaotian Feng <dfeng@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: Venkatesh Pallipadi <venki@xxxxxxxxxx>
Cc: Xiaotian Feng <dfeng@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
---
 lib/rbtree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/rbtree.c b/lib/rbtree.c
index 4693f79..7bb8f7f 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -295,7 +295,7 @@ up:
 
 	if (node == parent->rb_left && parent->rb_right)
 		func(parent->rb_right, data);
-	else if (parent->rb_left)
+	else if (node == parent->rb_right && parent->rb_left)
 		func(parent->rb_left, data);
 
 	node = parent;
-- 
1.7.1.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/