lib/rbtree: get successor's color directly

After move parent assignment out, we can check the color directly. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Wei Yang <[email protected]> Acked-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Michel Lespinasse <[email protected]> Reviewed-by: Davidlohr Bueso <[email protected]> Cc: Thomas Gleixner <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
ambv · Dec 5, 2019 · 8b7569a · 8b7569a
1 parent 11d43e6
commit 8b7569a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
@@ -286,8 +286,7 @@ __rb_erase_augmented(struct rb_node *node, struct rb_root *root,
 			rb_set_parent_color(child2, parent, RB_BLACK);
 			rebalance = NULL;
 		} else {
-			unsigned long pc2 = successor->__rb_parent_color;
-			rebalance = __rb_is_black(pc2) ? parent : NULL;
+			rebalance = rb_is_black(successor) ? parent : NULL;
 		}
 		successor->__rb_parent_color = pc;
 		tmp = successor;