From bd9cc37a040425551b6e5fe0dea87623635aca3e Mon Sep 17 00:00:00 2001 From: Wolfram Strepp Date: Wed, 20 Dec 2017 18:00:49 +0100 Subject: [PATCH] rbtree: remove redundant if()-condition in rb_erase() Furthermore, notice that the initial checks: if (!node->rb_left) child = node->rb_right; else if (!node->rb_right) child = node->rb_left; else { ... } guarantee that old->rb_right is set in the final else branch, therefore we can omit checking that again. Signed-off-by: Wolfram Strepp Signed-off-by: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [Linux commit 4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee] Ported to Xen. Signed-off-by: Praveen Kumar Acked-by: Jan Beulich --- xen/common/rbtree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c index 167ebfdc4d..62e6387dcd 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -250,15 +250,15 @@ void rb_erase(struct rb_node *node, struct rb_root *root) if (child) rb_set_parent(child, parent); parent->rb_left = child; + + node->rb_right = old->rb_right; + rb_set_parent(old->rb_right, node); } node->rb_parent_color = old->rb_parent_color; - node->rb_right = old->rb_right; node->rb_left = old->rb_left; - rb_set_parent(old->rb_left, node); - if (old->rb_right) - rb_set_parent(old->rb_right, node); + goto color; } -- 2.30.2