Skip to contentSkip to conversation

maple_tree-we-dont-set-offset-to-maple_node_slots-on-error.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 14, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: we don't set offset to MAPLE_NODE_SLOTS on error
has been removed from the -mm tree. Its filename was
maple_tree-we-dont-set-offset-to-maple_node_slots-on-error.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: we don't set offset to MAPLE_NODE_SLOTS on error
Date: Sat, 16 Nov 2024 01:48:05 +0000

When mas_anode_descend() not find gap, it sets -EBUSY instead of setting offset to MAPLE_NODE_SLOTS.

---

 lib/maple_tree.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-we-dont-set-offset-to-maple_node_slots-on-error +2 -5
@@ -5000,8 +5000,8 @@ static inline void mas_awalk(struct ma_s
 	 * There are 4 options:
 	 * go to child (descend)
 	 * go back to parent (ascend)
-	 * no gap found. (return, slot == MAPLE_NODE_SLOTS)
-	 * found the gap. (return, slot != MAPLE_NODE_SLOTS)
+	 * no gap found. (return, error == -EBUSY)
+	 * found the gap. (return)
 	 */
 	while (!mas_is_err(mas) && !mas_anode_descend(mas, size)) {
 		if (last == mas->node)
@@ -5086,9 +5086,6 @@ int mas_empty_area(struct ma_state *mas,
 		return xa_err(mas->node);
 
 	offset = mas->offset;
-	if (unlikely(offset == MAPLE_NODE_SLOTS))
-		return -EBUSY;
-
 	node = mas_mn(mas);
 	mt = mte_node_type(mas->node);
 	pivots = ma_pivots(node, mt);

_

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