From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Date: Wed, 13 Dec 2023 06:15:11 +0000 (-0800)
Subject: maple_tree: use mas_store_gfp() in mas_erase()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62c1ca195609493b84a008bc8dd608bc59b6c403;p=users%2Fjedix%2Flinux-maple.git

maple_tree: use mas_store_gfp() in mas_erase()

Refactor mas_erase() to simply call mas_store_gfp() which will abstract
storing the null, memory allocation, and error handling.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 94c652d545cd0..6ffc93bdf1618 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -6303,7 +6303,6 @@ EXPORT_SYMBOL_GPL(mas_find_range_rev);
 void *mas_erase(struct ma_state *mas)
 {
 	void *entry;
-	MA_WR_STATE(wr_mas, mas, NULL);
 
 	if (!mas_is_active(mas) || !mas_is_start(mas))
 		mas->status = ma_start;
@@ -6313,15 +6312,9 @@ void *mas_erase(struct ma_state *mas)
 	if (!entry)
 		return NULL;
 
-write_retry:
 	/* Must reset to ensure spanning writes of last slot are detected */
 	mas_reset(mas);
-	mas_wr_store_setup(&wr_mas);
-	mas_wr_store_entry(&wr_mas);
-	if (mas_nomem(mas, GFP_KERNEL))
-		goto write_retry;
-
-	mas_destroy(mas);
+	mas_store_gfp(mas, NULL, GFP_KERNEL);
 	return entry;
 }
 EXPORT_SYMBOL_GPL(mas_erase);