From: Wei Yang <richardw.yang@linux.intel.com>
To: akpm@linux-foundation.org, peterz@infradead.org,
walken@google.com, richardw.yang@linux.intel.com, dbueso@suse.de,
tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org
Subject: [Patch v2 2/2] lib/rbtree: get successor's color directly
Date: Mon, 28 Oct 2019 10:14:42 +0800 [thread overview]
Message-ID: <20191028021442.5450-2-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20191028021442.5450-1-richardw.yang@linux.intel.com>
After move parent assignment out, we can check the color directly.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
include/linux/rbtree_augmented.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
index 99c42e1a74b8..724b0d036b57 100644
--- a/include/linux/rbtree_augmented.h
+++ b/include/linux/rbtree_augmented.h
@@ -286,8 +286,7 @@ __rb_erase_augmented(struct rb_node *node, struct rb_root *root,
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;
--
2.17.1
next prev parent reply other threads:[~2019-10-28 2:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 2:14 [Patch v2 1/2] lib/rbtree: set successor's parent unconditionally Wei Yang
2019-10-28 2:14 ` Wei Yang [this message]
2019-10-28 9:21 ` [Patch v2 2/2] lib/rbtree: get successor's color directly Peter Zijlstra
2019-10-28 4:29 ` [Patch v2 1/2] lib/rbtree: set successor's parent unconditionally Michel Lespinasse
2019-10-28 6:23 ` Wei Yang
2019-10-28 9:20 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028021442.5450-2-richardw.yang@linux.intel.com \
--to=richardw.yang@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=dbueso@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=walken@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox