diff mbox series

maple_tree: Fix return from mas_prealloc()

Message ID 20220617134609.1771611-1-Liam.Howlett@oracle.com (mailing list archive)
State New
Headers show
Series maple_tree: Fix return from mas_prealloc() | expand

Commit Message

Liam R. Howlett June 17, 2022, 1:46 p.m. UTC 
Record the error code before overwriting the node pointer and return the
error.

Fixes: 2ef6c13ee71e (maple_tree: make mas_prealloc() error checking more generic)
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 lib/maple_tree.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 89ff5ef7ee28..1f4c476aa5e7 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5670,6 +5670,8 @@  void mas_store_prealloc(struct ma_state *mas, void *entry)
  */
 int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 {
+	int ret;
+
 	mas_set_alloc_req(mas, 1 + mas_mt_height(mas) * 3);
 	mas_alloc_nodes(mas, gfp);
 	if (likely(!mas_is_err(mas)))
@@ -5677,8 +5679,9 @@  int mas_preallocate(struct ma_state *mas, void *entry, gfp_t gfp)
 
 	mas_set_alloc_req(mas, 0);
 	mas_destroy(mas);
+	ret = xa_err(mas->node);
 	mas->node = MAS_START;
-	return xa_err(mas->node);
+	return ret;
 }
 
 /*