The patch titled rb_tree: remove redundant if()-condition in rb_erase() has been removed from the -mm tree. Its filename was rb_tree-remove-redundant-if-condition-in-rb_erase.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: rb_tree: remove redundant if()-condition in rb_erase() From: "Wolfram Strepp" <wstrepp@xxxxxx> 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 <wstrepp@xxxxxx> Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/rbtree.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN lib/rbtree.c~rb_tree-remove-redundant-if-condition-in-rb_erase lib/rbtree.c --- a/lib/rbtree.c~rb_tree-remove-redundant-if-condition-in-rb_erase +++ a/lib/rbtree.c @@ -250,15 +250,15 @@ void rb_erase(struct rb_node *node, stru 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; } _ Patches currently in -mm which might be from wstrepp@xxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html