From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D672C43603 for ; Thu, 5 Dec 2019 00:51:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E84121823 for ; Thu, 5 Dec 2019 00:51:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="nTZgIGSP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E84121823 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C092E6B0DB1; Wed, 4 Dec 2019 19:51:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BBA756B0DB3; Wed, 4 Dec 2019 19:51:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF6C46B0DB4; Wed, 4 Dec 2019 19:51:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0235.hostedemail.com [216.40.44.235]) by kanga.kvack.org (Postfix) with ESMTP id 959076B0DB1 for ; Wed, 4 Dec 2019 19:51:52 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 5ECBA181AEF21 for ; Thu, 5 Dec 2019 00:51:52 +0000 (UTC) X-FDA: 76229260464.04.trick28_104e163a50314 X-HE-Tag: trick28_104e163a50314 X-Filterd-Recvd-Size: 2587 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 5 Dec 2019 00:51:51 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E91CF2465A; Thu, 5 Dec 2019 00:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575507111; bh=HRgLR/BPG2eiE2unrsBefEXMFIKRCpEPrmomY4VSrOs=; h=Date:From:To:Subject:In-Reply-To:From; b=nTZgIGSPUGFb3bfKhSjpQVpY/ms9hoTpT0B0a837DN0erIreCPL5onH+w0U/jlfyd vIN0gElUXfWMLWpcvz8AIte7NbMGNpt39KQ4L20W8jB7BcUkX/7NIMTB16FJBxILqE qttvMq/CayIBsknF2Kl29DbBx5vdkDlVRMQmF38c= Date: Wed, 04 Dec 2019 16:51:50 -0800 From: Andrew Morton To: akpm@linux-foundation.org, dbueso@suse.de, linux-mm@kvack.org, mm-commits@vger.kernel.org, peterz@infradead.org, richardw.yang@linux.intel.com, tglx@linutronix.de, torvalds@linux-foundation.org, walken@google.com Subject: [patch 39/86] lib/rbtree: get successor's color directly Message-ID: <20191205005150.Up3F8xMcN%akpm@linux-foundation.org> In-Reply-To: <20191204164858.fe4ed8886e34ad9f3b34ea00@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Wei Yang Subject: lib/rbtree: get successor's color directly After move parent assignment out, we can check the color directly. Link: http://lkml.kernel.org/r/20191028021442.5450-2-richardw.yang@linux.intel.com Signed-off-by: Wei Yang Acked-by: Peter Zijlstra (Intel) Reviewed-by: Michel Lespinasse Reviewed-by: Davidlohr Bueso Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- include/linux/rbtree_augmented.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/include/linux/rbtree_augmented.h~lib-rbtree-get-successors-color-directly +++ a/include/linux/rbtree_augmented.h @@ -286,8 +286,7 @@ __rb_erase_augmented(struct rb_node *nod 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; _