Skip to contentSkip to conversation

rbtree: avoid func twice when node doesn't have a right sibling

PATCH New Xiaotian Feng 1 participant 1 message Jul 13, 2010 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rbtree: avoid func twice when node doesn't have a right sibling

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.

Cc Suresh Siddha <[email protected]>
Cc Venkatesh Pallipadi <[email protected]>
Cc Xiaotian Feng <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Peter Zijlstra <[email protected]>
---
 lib/rbtree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/rbtree.c +1 -1
index 4693f79..7bb8f7f 100644
@@ -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;
Signature · 1 line
1.7.1.1