Skip to contentSkip to conversation

lib-radix-tree-remove-unused-argument-of-insert_entries.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Jul 18, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/radix-tree: remove unused argument of insert_entries
has been removed from the -mm tree. Its filename was
lib-radix-tree-remove-unused-argument-of-insert_entries.patch

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

------------------------------------------------------
From: wuchi <[email protected]>
Subject: lib/radix-tree: remove unused argument of insert_entries
Date: Sat, 25 Jun 2022 21:53:24 +0800

insert_entries() doesn't use the 'bool replace' argument, and the function is only used locally, remove the argument.

The historical context of the unused argument is as follow:

2: commit <3a08cd52c37c79> (radix tree: Remove multiorder support)
Remove the code related to macro CONFIG_RADIX_TREE_MULTIORDER
to convert to the xArray.
Without the macro, there is no need to retain the argument.

1: commit <175542f575723e> (radix-tree: add radix_tree_join)
Add insert_entries(..., bool replace) function, depending on the
macro CONFIG_RADIX_TREE_MULTIORDER definition, the implementation is different. Notice that the implementation without the macro doesn't use the argument.

[Matthew Wilcox: add historical context for argument]

---

 lib/radix-tree.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
lib/radix-tree.c renamed from lib/radix-tree.c~lib-radix-tree-remove-unused-argument-of-insert_entries +2 -2
@@ -677,7 +677,7 @@ static void radix_tree_free_nodes(struct
 }
 
 static inline int insert_entries(struct radix_tree_node *node,
-		void __rcu **slot, void *item, bool replace)
+		void __rcu **slot, void *item)
 {
 	if (*slot)
 		return -EEXIST;
@@ -711,7 +711,7 @@ int radix_tree_insert(struct radix_tree_
 	if (error)
 		return error;
 
-	error = insert_entries(node, slot, item, false);
+	error = insert_entries(node, slot, item);
 	if (error < 0)
 		return error;
 

_

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

lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch