From: Liam R. Howlett <Liam.Howlett@Oracle.com>
Date: Mon, 1 Feb 2021 18:48:20 +0000 (-0500)
Subject: mm/mmap: Use mtree_init() in mt_destroy_walk()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ac958366444a3d60be89d5103d7110282634c85a;p=users%2Fjedix%2Flinux-maple.git

mm/mmap: Use mtree_init() in mt_destroy_walk()

Don't use MTREE_INIT()

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 19887e46720c7..ba89ebfc2af0a 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5156,12 +5156,14 @@ static void mt_destroy_walk(struct rcu_head *head)
 	void **slots;
 	struct maple_node *node = container_of(head, struct maple_node, rcu);
 	struct maple_enode *start;
-	struct maple_tree mt = MTREE_INIT(mt, node->ma_flags);
-	MA_STATE(mas, &mt, 0, 0);
+	struct maple_tree mt;
+	MA_STATE(mas, NULL, 0, 0);
 
 	if (ma_is_leaf(node->type))
 		goto free_leaf;
 
+	mtree_init(&mt, node->ma_flags);
+	mas.tree = &mt;
 	start = mt_mk_node(node, node->type);
 	mas.node = start;
 	slots = mas_destroy_descend(&mas);