maple_tree: use MAS_BUG_ON() from mas_topiary_range()
authorLiam R. Howlett <Liam.Howlett@oracle.com>
Thu, 18 May 2023 14:55:21 +0000 (10:55 -0400)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 9 Jun 2023 23:25:30 +0000 (16:25 -0700)
In the even of trying to remove data from a leaf node by use of
mas_topiary_range(), log the maple state.

Link: https://lkml.kernel.org/r/20230518145544.1722059-13-Liam.Howlett@oracle.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: David Binderman <dcb314@hotmail.com>
Cc: Peng Zhang <zhangpeng.00@bytedance.com>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Vernon Yang <vernon2gm@gmail.com>
Cc: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
lib/maple_tree.c

index 1b1b60ab70b4d9129df9c72f81eeb73571369ecf..0d85f4e99cfa5da9789236504cb15872828364d4 100644 (file)
@@ -2345,7 +2345,8 @@ static inline void mas_topiary_range(struct ma_state *mas,
        void __rcu **slots;
        unsigned char offset;
 
-       MT_BUG_ON(mas->tree, mte_is_leaf(mas->node));
+       MAS_BUG_ON(mas, mte_is_leaf(mas->node));
+
        slots = ma_slots(mas_mn(mas), mte_node_type(mas->node));
        for (offset = start; offset <= end; offset++) {
                struct maple_enode *enode = mas_slot_locked(mas, slots, offset);