From aa5b28a963e66c7a37e4d34540496b5b2e41a41c Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 25 Jan 2019 15:43:38 -0500 Subject: [PATCH] maple_tree: Load safe root to mas->node in encoded_parent Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index ac1d55a15314..0e87a093f137 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -191,7 +191,7 @@ static inline void ma_encoded_parent(struct ma_state *mas) unsigned char slot; if (ma_is_root(mt_to_node(mas->node)->parent)) { - mas->node = rcu_dereference(mas->tree->ma_root); + mas->node = mt_safe_root(rcu_dereference(mas->tree->ma_root)); return; } @@ -513,7 +513,6 @@ static int ma_split(struct ma_state *mas, unsigned char slot, if (ma_is_root(full)) { old_parent = full; - mas->node = mt_safe_root(mas->node); } else { old_parent = mt_parent(mas->node); p_end = ma_data_end_r64(&old_parent->mr64, UINT_MAX); -- 2.50.1