Skip to contentSkip to conversation

maple_tree-goto-complete-directly-on-a-pivot-of-0.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: goto complete directly on a pivot of 0
has been removed from the -mm tree. Its filename was
maple_tree-goto-complete-directly-on-a-pivot-of-0.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: goto complete directly on a pivot of 0
Date: Wed, 11 Sep 2024 14:27:59 +0000

When we break the loop after assigning a pivot, the index i/j is not changed. Then the following code assign pivot, which means we do the assignment with same i/j by mas_safe_pivot.

Since the loop condition is (i < piv_end), from which we can get i is less than mt_pivots[mt]. It implies mas_safe_pivot() return pivot[i] which is the same value we get in loop.

Now we can conclude it does a redundant assignment on a pivot of 0. Let's just go to complete to avoid it.

---

 lib/maple_tree.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-goto-complete-directly-on-a-pivot-of-0 +1 -1
@@ -1943,7 +1943,7 @@ static inline void mas_mab_cp(struct ma_
 	for (; i < piv_end; i++, j++) {
 		b_node->pivot[j] = pivots[i];
 		if (unlikely(!b_node->pivot[j]))
-			break;
+			goto complete;
 
 		if (unlikely(mas->max == b_node->pivot[j]))
 			goto complete;

_

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