Skip to contentSkip to conversation

maple_tree-simplify-mas_push_node.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: simplify mas_push_node()
has been removed from the -mm tree. Its filename was
maple_tree-simplify-mas_push_node.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: simplify mas_push_node()
Date: Tue, 15 Oct 2024 12:07:46 +0000

When count is not 0, we know head is valid. So we can put the assignment in if (count) instead of checking the head pointer again.

Also count represents current total, we can assign the new total by increasing the count by one.

---

 lib/maple_tree.c |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-simplify-mas_push_node +7 -9
@@ -1207,19 +1207,17 @@ static inline void mas_push_node(struct
 
 	reuse->request_count = 0;
 	reuse->node_count = 0;
-	if (count && (head->node_count < MAPLE_ALLOC_SLOTS)) {
-		head->slot[head->node_count++] = reuse;
-		head->total++;
-		goto done;
-	}
-
-	reuse->total = 1;
-	if ((head) && !((unsigned long)head & 0x1)) {
+	if (count) {
+		if (head->node_count < MAPLE_ALLOC_SLOTS) {
+			head->slot[head->node_count++] = reuse;
+			head->total++;
+			goto done;
+		}
 		reuse->slot[0] = head;
 		reuse->node_count = 1;
-		reuse->total += head->total;
 	}
 
+	reuse->total = count + 1;
 	mas->alloc = reuse;
 done:
 	if (requested > 1)

_

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