From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Tue, 26 Aug 2025 16:12:06 +0000 (-0400)
Subject: ascend cleanup
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd01fd37991c691cd8c5f30465d785a9686efd79;p=users%2Fjedix%2Flinux-maple.git

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 213653838ce0..bed750d046c4 100644
--- 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);