From: Liam R. Howlett Date: Thu, 1 Sep 2022 20:29:29 +0000 (-0400) Subject: maple_tree: Remove BUG_ON() from ma_meta_gap() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b1c2bdecc3a98faf21f89a536f4329ca74789f1;p=users%2Fjedix%2Flinux-maple.git 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 --- diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 9c4c72512f68..9401136d77dc 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -917,8 +917,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; } @@ -1572,6 +1570,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; @@ -1605,6 +1604,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;