maple_tree: Convert debug code to use MT_WARN_ON()

Using MT_WARN_ON() allows for the removal of if statements before
logging.

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

diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 2a58fe0c2e4c8fd24b7744ae5c77df3466daaa52..dfcc2edfb3a91d7350f3ee534146afc76937c889 100644 (file)
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5734,9 +5734,8 @@ void *mas_store(struct ma_state *mas, void *entry)
 
        trace_ma_write(__func__, mas, 0, entry);
 #ifdef CONFIG_DEBUG_MAPLE_TREE
-       if (mas->index > mas->last)
+       if (MT_WARN_ON(mas->tree, mas->index > mas->last))
                pr_err("Error %lX > %lX %p\n", mas->index, mas->last, entry);
-       MT_BUG_ON(mas->tree, mas->index > mas->last);
        if (mas->index > mas->last) {
                mas_set_err(mas, -EINVAL);
                return NULL;
@@ -6554,10 +6553,9 @@ unlock:
        if (likely(entry)) {
                *index = mas.last + 1;
 #ifdef CONFIG_DEBUG_MAPLE_TREE
-               if ((*index) && (*index) <= copy)
+               if (MT_WARN_ON(mt, (*index) && ((*index) <= copy)))
                        pr_err("index not increased! %lx <= %lx\n",
                               *index, copy);
-               MT_BUG_ON(mt, (*index) && ((*index) <= copy));
 #endif
        }
 
@@ -6703,7 +6701,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
        max = mas->max;
        mas->offset = 0;
        while (likely(!ma_is_leaf(mt))) {
-               MT_BUG_ON(mas->tree, mte_dead_node(mas->node));
+               MT_WARN_ON(mas->tree, mte_dead_node(mas->node));
                slots = ma_slots(mn, mt);
                entry = mas_slot(mas, slots, 0);
                pivots = ma_pivots(mn, mt);
@@ -6714,7 +6712,7 @@ static inline void *mas_first_entry(struct ma_state *mas, struct maple_node *mn,
                mn = mas_mn(mas);
                mt = mte_node_type(mas->node);
        }
-       MT_BUG_ON(mas->tree, mte_dead_node(mas->node));
+       MT_WARN_ON(mas->tree, mte_dead_node(mas->node));
 
        mas->max = max;
        slots = ma_slots(mn, mt);
@@ -6995,19 +6993,19 @@ static void mas_validate_node(struct ma_state *mas,
                if ((piv < prev_piv)) {
                        pr_err("%p[%u] piv %lu < prev_piv %lu\n",
                                mas_mn(mas), i, piv, prev_piv);
-                       MT_BUG_ON(mas->tree, piv < prev_piv);
+                       MT_WARN_ON(mas->tree, piv < prev_piv);
                }
 
                if (piv < mas->min) {
                        pr_err("%p[%u] %lu < %lu\n", mas_mn(mas), i,
                                piv, mas->min);
-                       MT_BUG_ON(mas->tree, piv < mas->min);
+                       MT_WARN_ON(mas->tree, piv < mas->min);
                }
 
                if (piv > mas->max) {
                        pr_err("%p[%u] %lu > %lu\n", mas_mn(mas), i,
                                piv, mas->max);
-                       MT_BUG_ON(mas->tree, piv > mas->max);
+                       MT_WARN_ON(mas->tree, piv > mas->max);
                }
 
                child = mas_slot(mas, slots, i);
@@ -7124,7 +7122,7 @@ next_in_leaf:
 
                        pr_err("%p[%u] should not have piv %lu\n",
                               mas_mn(mas), i, piv);
-                       MT_BUG_ON(mas->tree, i < mt_pivots[type] - 1);
+                       MT_WARN_ON(mas->tree, i < mt_pivots[type] - 1);
                }
        }
 }
@@ -7148,16 +7146,15 @@ void mt_validate(struct maple_tree *mt)
        last = mas.node;
        mas_first_entry(&mas, mas_mn(&mas), ULONG_MAX, mte_node_type(mas.node));
        while (!mas_is_none(&mas)) {
-               MT_BUG_ON(mas.tree, mte_dead_node(mas.node));
+               MT_WARN_ON(mas.tree, mte_dead_node(mas.node));
                if (!mte_is_root(mas.node)) {
                        end = mas_data_end(&mas);
-                       if ((end < mt_min_slot_count(mas.node)) &&
-                           (mas.max != ULONG_MAX)) {
+                       if (MT_WARN_ON(mas.tree,
+                                      (end < mt_min_slot_count(mas.node)) &&
+                                      (mas.max != ULONG_MAX))) {
                                pr_err("Invalid size %u of %p\n", end,
                                       mas_mn(&mas));
-                               MT_BUG_ON(mas.tree, 1);
                        }
-
                }
 
                mas_validate_node(&mas, last);