From: Wei Yang <richard.weiyang@gmail.com>
Date: Thu, 31 Oct 2024 23:16:25 +0000 (+0000)
Subject: maple_tree: not necessary to check index/last again
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=798fbfebd73c61a2fd5b6fcf6671003dc06c7773;p=users%2Fjedix%2Flinux-maple.git

maple_tree: not necessary to check index/last again

Before calling mas_new_root(), the range has been checked.

Link: https://lkml.kernel.org/r/20241031231627.14316-4-richard.weiyang@gmail.com
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 071d3055f1fa..4900f182e99d 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3670,7 +3670,9 @@ static inline void mas_new_root(struct ma_state *mas, void *entry)
 	void __rcu **slots;
 	unsigned long *pivots;
 
-	if (!entry && !mas->index && mas->last == ULONG_MAX) {
+	WARN_ON_ONCE(mas->index || mas->last != ULONG_MAX);
+
+	if (!entry) {
 		mas->depth = 0;
 		mas_set_height(mas);
 		rcu_assign_pointer(mas->tree->ma_root, entry);