Skip to contentSkip to conversation

maple_tree-arange64-node-is-not-a-leaf-node.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 9, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: arange64 node is not a leaf node
has been removed from the -mm tree. Its filename was
maple_tree-arange64-node-is-not-a-leaf-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: arange64 node is not a leaf node
Date: Mon, 26 Aug 2024 01:24:21 +0000

mt_dump_arange64() only applies to an entry whose type is maple_arange_64, in which mte_is_leaf() must return false.

Since mte_is_leaf() here is always false, we can remove this condition check.

---

 lib/maple_tree.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-arange64-node-is-not-a-leaf-node +1 -5
@@ -7203,7 +7203,6 @@ static void mt_dump_arange64(const struc
 	enum mt_dump_format format)
 {
 	struct maple_arange_64 *node = &mte_to_node(entry)->ma64;
-	bool leaf = mte_is_leaf(entry);
 	unsigned long first = min;
 	int i;
 
@@ -7237,10 +7236,7 @@ static void mt_dump_arange64(const struc
 			break;
 		if (last == 0 && i > 0)
 			break;
-		if (leaf)
-			mt_dump_entry(mt_slot(mt, node->slot, i),
-					first, last, depth + 1, format);
-		else if (node->slot[i])
+		if (node->slot[i])
 			mt_dump_node(mt, mt_slot(mt, node->slot, i),
 					first, last, depth + 1, format);
 

_

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