From 321899249bb7a6bd4e94fe82c93051e97b56fc88 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Thu, 1 Sep 2022 16:29:29 -0400 Subject: [PATCH] maple_tree: Remove BUG_ON() from ma_meta_gap() Replace the in-function call to BUG_ON() with calls before the function call MT_WARN_ON() to get more information on error conditions and to avoid crashing - although the crash is imminent in this case. Signed-off-by: Liam R. Howlett --- lib/maple_tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index f7273b30cf23..f2faa9917a3f 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -953,8 +953,6 @@ static inline unsigned char ma_meta_end(struct maple_node *mn, static inline unsigned char ma_meta_gap(struct maple_node *mn, enum maple_type mt) { - BUG_ON(mt != maple_arange_64); - return mn->ma64.meta.gap; } @@ -1620,6 +1618,7 @@ static inline unsigned long mas_max_gap(struct ma_state *mas) return mas_leaf_max_gap(mas); node = mas_mn(mas); + MT_WARN_ON(mas->tree, mt != maple_arange_64); offset = ma_meta_gap(node, mt); if (offset == MAPLE_ARANGE64_META_MAX) return 0; @@ -1653,6 +1652,7 @@ static inline void mas_parent_gap(struct ma_state *mas, unsigned char offset, pgaps = ma_gaps(pnode, pmt); ascend: + MT_WARN_ON(mas->tree, pmt != maple_arange_64); meta_offset = ma_meta_gap(pnode, pmt); if (meta_offset == MAPLE_ARANGE64_META_MAX) meta_gap = 0; -- 2.49.0