Skip to contentSkip to conversation

maple_tree-use-mas_store_gfp-in-mtree_store_range.patch removed from -mm tree

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

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: maple_tree: use mas_store_gfp() in mtree_store_range()
has been removed from the -mm tree. Its filename was
maple_tree-use-mas_store_gfp-in-mtree_store_range.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: Sidhartha Kumar <[email protected]>
Subject: maple_tree: use mas_store_gfp() in mtree_store_range()
Date: Wed, 14 Aug 2024 12:19:34 -0400

Refactor mtree_store_range() to use mas_store_gfp() which will abstract the store, memory allocation, and error handling.

---

 lib/maple_tree.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-use-mas_store_gfp-in-mtree_store_range +1 -10
@@ -6476,7 +6476,6 @@ int mtree_store_range(struct maple_tree
 		unsigned long last, void *entry, gfp_t gfp)
 {
 	MA_STATE(mas, mt, index, last);
-	MA_WR_STATE(wr_mas, &mas, entry);
 	int ret = 0;
 
 	trace_ma_write(__func__, &mas, 0, entry);
@@ -6487,17 +6486,9 @@ int mtree_store_range(struct maple_tree
 		return -EINVAL;
 
 	mtree_lock(mt);
-retry:
-	mas_wr_store_entry(&wr_mas);
-	if (mas_nomem(&mas, gfp))
-		goto retry;
-
+	ret = mas_store_gfp(&mas, entry, gfp);
 	mtree_unlock(mt);
 
-	if (mas_is_err(&mas))
-		ret = xa_err(mas.node);
-
-	mas_destroy(&mas);
 	return ret;
 }
 EXPORT_SYMBOL(mtree_store_range);

_

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