Commit bec1b51e authored by Liam R. Howlett's avatar Liam R. Howlett Committed by Andrew Morton
Browse files

maple_tree: use MAS_BUG_ON() prior to calling mas_meta_gap() 

Replace the call to BUG_ON() in mas_meta_gap() with calls before the
function call MAS_BUG_ON() to get more information on error condition.

Link: https://lkml.kernel.org/r/20230518145544.1722059-15-Liam.Howlett@oracle.com


Signed-off-by: default avatarLiam 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1c414c6a

lib/maple_tree.c

+2 −2
Original line number Diff line number Diff line
@@ -963,8 +963,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;

}
@@ -1628,6 +1626,7 @@ static inline unsigned long mas_max_gap(struct ma_state *mas) 
		return mas_leaf_max_gap(mas);



	node = mas_mn(mas);

	MAS_BUG_ON(mas, mt != maple_arange_64);

	offset = ma_meta_gap(node, mt);

	if (offset == MAPLE_ARANGE64_META_MAX)

		return 0;
@@ -1661,6 +1660,7 @@ static inline void mas_parent_gap(struct ma_state *mas, unsigned char offset, 
	pgaps = ma_gaps(pnode, pmt);



ascend:

	MAS_BUG_ON(mas, pmt != maple_arange_64);

	meta_offset = ma_meta_gap(pnode, pmt);

	if (meta_offset == MAPLE_ARANGE64_META_MAX)

		meta_gap = 0;