ascend cleanup

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 213653838ce0fb5c8da6b71ad5d538d5698e059e..bed750d046c4c72460fd27a5b34ef3720fc2cb5b 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -3323,15 +3323,12 @@ static bool spanning_ascend(struct maple_copy *cp, struct ma_state *mas,
                printk("cp->dst %p cp->slot %p\n", cp->dst[0].node, mte_to_node(cp->slot[0]));
                return false;
        } else if (l_wr_mas->mas->node == r_wr_mas->mas->node){
-               if (cp->d_count == 1) {
-                       cp->dst[0].node->parent = mas_mn(mas)->parent;
-                       return false;
-               }
-               BUG_ON(1);
-       } else {
-               printk("\t\t\t\td_count %u\n", cp->d_count);
+               WARN_ON_ONCE(cp->d_count != 1);
+               cp->dst[0].node->parent = mas_mn(mas)->parent;
+               return false;
        }
 
+       printk("\t\t\t\td_count %u\n", cp->d_count);
        printk("more nodes.. %u\n", cp->end);
        wr_mas_ascend(l_wr_mas);
        wr_mas_ascend(r_wr_mas);