From patchwork Fri Jul 14 08:26:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Praveen Kumar X-Patchwork-Id: 9840157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF74660381 for ; Fri, 14 Jul 2017 08:29:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC5E62874F for ; Fri, 14 Jul 2017 08:29:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A015228779; Fri, 14 Jul 2017 08:29:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM, RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0790327FB6 for ; Fri, 14 Jul 2017 08:29:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dVvwj-0007tu-PW; Fri, 14 Jul 2017 08:27:33 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dVvwi-0007sc-Vd for xen-devel@lists.xen.org; Fri, 14 Jul 2017 08:27:33 +0000 Received: from [193.109.254.147] by server-5.bemta-6.messagelabs.com id 10/ED-03368-47088695; Fri, 14 Jul 2017 08:27:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRWlGSWpSXmKPExsXiVRvsrFvckBF pcPSWscWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmvF87y7Wgt1cFfNOWjcwTuToYuTiEBKYyChx 5OlaZhCHReAli8TUzT+YQBwJgX5WiRvdbSxdjJxATpzE/en7mSHsKolTzxexgthCAmoSW+adY oaw/zNKLJwt38XIwcEmoCvRfqsAJCwiIC1x7fNlRpCZzALfGSXWvJ8C1iss4CGx/9QeMJtFQF ViXtNjdpBeXgFbicWHpSBWyUss2jSDBSTMCRR+8jQDxBQSsJFYeK1+AqPAAkaGVYzqxalFZal FuqZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBAcUABDsYp1/2P8QoycGkJMpb mp4RKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCd049UE6wKDU9tSItMwcY2jBpCQ4eJRHeSJA0b 3FBYm5xZjpE6hSjMcekA9u/MHG8mvD/G5MQS15+XqqUOG8SSKkASGlGaR7cIFjMXWKUlRLmZQ Q6TYinILUoN7MEVf4VozgHo5Iw78s6oCk8mXklcPteAZ3CBHRKWxbYKSWJCCmpBsaARQc94r4 +PrujgS0p2WLmoYqDVp9668xuHGL2/PzTwDFAr2SV0keT4nKtu0rHXT9L8qa/Uqn4VDpF4Ktd 9MywhcpLH+3Mf3hBz2V74sOL/mbq6p5TQjxWKfJNNZYqSUw8dH3+mtI4n71NzpvZi8VVwv5ve Wbg+ifz18Ls2/XM/+6kT7185JESS3FGoqEWc1FxIgCtJ6gltAIAAA== X-Env-Sender: kpraveen.lkml@gmail.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1500020850!94680007!1 X-Originating-IP: [74.125.83.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14034 invoked from network); 14 Jul 2017 08:27:31 -0000 Received: from mail-pg0-f67.google.com (HELO mail-pg0-f67.google.com) (74.125.83.67) by server-14.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 14 Jul 2017 08:27:31 -0000 Received: by mail-pg0-f67.google.com with SMTP id d193so9866759pgc.2 for ; Fri, 14 Jul 2017 01:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bxYLxhD9Hj4+VJqEfKloepmO42KklSCeCfc7egJNuYg=; b=ASzpZXd8jl1q9nVvBvS3SHxx+fhBM/H7YHjFWUzRp2GCdN5LAnzFQhs05IQF/ZrHuu 4OksO4BX4MWiIfrLw34T9O8cH3jkFj4MiaUQiNeicIdPnxj+RwWgZIoI9UknsptEdywR qZ4pbR3iuGdmDFCl0hZfNJTX0dR3xt3VTZrkFen2PjBzsBFAnJ4J6QbSn76+8qsfVG+Y IUK05m9+4jD1T1RtWYmhMV1YyTp4w0y8JuPagXAdceNCaBuTibE2RvaQloTLtZK0jTC1 P+GGzbz4KFWgAGFOsqIE7jTIIAk4/enGBwtVDnoPU6vKi/qT15S1gWmtQjb3cNFlG9z7 9Luw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bxYLxhD9Hj4+VJqEfKloepmO42KklSCeCfc7egJNuYg=; b=ZI1lanVbtZe3FRZKskwdqeTpp6TNFzjPJ5HPgrASA6ubvaceg0JOD3fMISmColhtW7 EmD34BffboFe1p1vB5YYJduxRgpNSWUKBIfIJgzN3YCImy/6CmpxMbE1cEZxIt6ZEaIJ cw/eXDSPaf+Eqhwq+RPU3xq0TXpwgg/oAuCvzk5qSDEK+hSbi02LqixrQIGBssAoBhcR s7pxVhQqaadjj08GEIoEyVV0fq+TgdGI2EKwtSq7JXEQQXFHnoccC25JX+nXi+icMJsO hQEHHowucT2RhKvnuWeyiKlsG9t2lYzybcw+XBMWVk6px9EtZXk+T3DO/AAZp368WmBV i5KA== X-Gm-Message-State: AIVw112b5ztWtGYlt4hXyjNnZGFaizioGeWx1K6sQizOEwRs3D91c7eO Dv/avFwgYns7qgQG X-Received: by 10.101.88.130 with SMTP id d2mr13814172pgu.265.1500020850132; Fri, 14 Jul 2017 01:27:30 -0700 (PDT) Received: from kpraveen.labs.blr.novell.com ([192.31.114.252]) by smtp.gmail.com with ESMTPSA id u13sm1533836pgc.3.2017.07.14.01.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Jul 2017 01:27:29 -0700 (PDT) From: Praveen Kumar To: xen-devel@lists.xen.org Date: Fri, 14 Jul 2017 13:56:36 +0530 Message-Id: <20170714082636.29511-18-kpraveen.lkml@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170714082636.29511-1-kpraveen.lkml@gmail.com> References: <20170714082636.29511-1-kpraveen.lkml@gmail.com> Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, kpraveen.lkml@gmail.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH v5 17/17] rbtree: fix typo in comment of rb_insert_color X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yang In case 1, it passes down the BLACK color from G to p and u, and maintains the color of n. By doing so, it maintains the black height of the sub-tree. While in the comment, it marks the color of n to BLACK. This is a typo and not consistents with the code. This patch fixs this typo in comment. Signed-off-by: Wei Yang Acked-by: Michel Lespinasse Cc: Xiao Guangrong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds [Linux commit 1b9c53e849aa65776d4f611d99aa09f856518dad] Ported to Xen for rb_insert_color API. Signed-off-by: Praveen Kumar --- xen/common/rbtree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c index 8e1dd2c56e..7147481480 100644 --- a/xen/common/rbtree.c +++ b/xen/common/rbtree.c @@ -135,7 +135,7 @@ void rb_insert_color(struct rb_node *node, struct rb_root *root) * / \ / \ * p u --> P U * / / - * n N + * n n * * However, since g's parent might be red, and * 4) does not allow this, we need to recurse