Commit 85db8f24 authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

maple_tree: use mas_store_gfp() in mtree_store_range() 

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

Link: https://lkml.kernel.org/r/20240814161944.55347-8-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarLiam R. Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 7e093834

lib/maple_tree.c

+1 −10
Original line number Diff line number Diff line
@@ -6476,7 +6476,6 @@ int mtree_store_range(struct maple_tree *mt, unsigned long index, 
		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 *mt, unsigned long index, 
		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);