Skip to contentSkip to conversation

maple_tree-root-node-could-be-handled-by-p_slot-too.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Nov 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: root node could be handled by !p_slot too
has been removed from the -mm tree. Its filename was
maple_tree-root-node-could-be-handled-by-p_slot-too.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Wei Yang <[email protected]>
Subject: maple_tree: root node could be handled by !p_slot too
Date: Fri, 13 Sep 2024 06:31:28 +0000

For a root node, mte_parent_slot() return 0, this exactly fits the following !p_slot check.

So we can remove the special handling for root node.

---

 lib/maple_tree.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-root-node-could-be-handled-by-p_slot-too +1 -3
@@ -2155,9 +2155,7 @@ static inline bool mas_prev_sibling(stru
 {
 	unsigned int p_slot = mte_parent_slot(mas->node);
 
-	if (mte_is_root(mas->node))
-		return false;
-
+	/* For root node, p_slot is set to 0 by mte_parent_slot(). */
 	if (!p_slot)
 		return false;
 

_

Patches currently in -mm which might be from [email protected] are

mm-mlock-set-the-correct-prev-on-failure.patch maple_tree-print-empty-for-an-empty-tree-on-mt_dump.patch maple_tree-the-return-value-of-mas_root_expand-is-not-used.patch maple_tree-not-necessary-to-check-index-last-again.patch maple_tree-refine-mas_store_root-on-storing-null.patch maple_tree-add-a-test-checking-storing-null.patch