From febb599f34917223509a241f0d59bcfbefcbb3da Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 25 Jan 2019 16:03:21 -0500 Subject: [PATCH] maple_tree: Clean up erase function. The node type is set during the partial copy of data operation now. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 41488104a459..c31ee5623443 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -780,8 +780,8 @@ static int mas_coalesce(struct ma_state *mas) dst = mas_partial_copy(mas, s_slot); if (mas_is_err(mas)) return 0; - } + continue; } @@ -804,8 +804,6 @@ static int mas_coalesce(struct ma_state *mas) done: if (dst) { ret = s_slot - d_slot; - mas->node = mt_mk_node(mt_to_node(mas->node), - mt_node_type(mas->node)); mt_replace(mas); } return ret; -- 2.50.1