maple_tree: Detect dead nodes in mas_start()

When initially starting a search, the root node may already be in the
process of being replaced in RCU mode.  Detect and restart the walk if
this is the case.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 6bf865c7204174ffa60636c63fab22523a51d9dd..c5bbd2a072288f08e473bd44e4dd7d4d38b70cc5 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -1365,11 +1365,15 @@ static inline struct maple_enode *mas_start(struct ma_state *mas)
                mas->depth = 0;
                mas->offset = 0;
 
+retry:
                root = mas_root(mas);
                /* Tree with nodes */
                if (likely(xa_is_node(root))) {
                        mas->depth = 1;
                        mas->node = mte_safe_root(root);
+                       if (mte_dead_node(mas->node))
+                               goto retry;
+
                        return NULL;
                }