From 62c1ca195609493b84a008bc8dd608bc59b6c403 Mon Sep 17 00:00:00 2001 From: Sidhartha Kumar Date: Tue, 12 Dec 2023 22:15:11 -0800 Subject: [PATCH] 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 --- lib/maple_tree.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 94c652d545cd..6ffc93bdf161 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); -- 2.50.1