2010-07-13 10:31:24

by Xiaotian Feng

[permalink] [raw]
Subject: [PATCH -tip] 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.

Signed-off-by: Xiaotian Feng <[email protected]>
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(-)

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