From: Wolfram Strepp <wstrepp@gmx.de>
Date: Tue, 16 Jun 2009 22:34:13 +0000 (-0700)
Subject: rb_tree: remove redundant if()-condition in rb_erase()
X-Git-Tag: v2.6.31-rc1~299^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b324126e0c6c3a5080ca3ec0981e8766ed6f1ee;p=pandora-kernel.git

rb_tree: 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 <wstrepp@gmx.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed