[PATCH 3/3] maple_tree: we don't set offset to MAPLE_NODE_SLOTS on error

Liam R. Howlett Liam.Howlett at oracle.com
Mon Nov 18 12:50:49 PST 2024


* Wei Yang <richard.weiyang at gmail.com> [241115 20:48]:
> When mas_anode_descend() not find gap, it sets -EBUSY instead of setting
> offset to MAPLE_NODE_SLOTS.

This is for mas_start(), which I think is not necessary anymore.

> 
> Signed-off-by: Wei Yang <richard.weiyang at gmail.com>
> CC: Liam R. Howlett <Liam.Howlett at Oracle.com>
> CC: Lorenzo Stoakes <lorenzo.stoakes at oracle.com>
> CC: Sidhartha Kumar <sidhartha.kumar at oracle.com>
> ---
>  lib/maple_tree.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index ab235d0194f7..b67dae356182 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -5011,8 +5011,8 @@ static inline void mas_awalk(struct ma_state *mas, unsigned long size)
>  	 * There are 4 options:
>  	 * go to child (descend)
>  	 * go back to parent (ascend)
> -	 * no gap found. (return, slot == MAPLE_NODE_SLOTS)
> -	 * found the gap. (return, slot != MAPLE_NODE_SLOTS)
> +	 * no gap found. (return, error == -EBUSY)
> +	 * found the gap. (return)
>  	 */
>  	while (!mas_is_err(mas) && !mas_anode_descend(mas, size)) {
>  		if (last == mas->node)
> @@ -5097,9 +5097,6 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
>  		return xa_err(mas->node);
>  
>  	offset = mas->offset;
> -	if (unlikely(offset == MAPLE_NODE_SLOTS))
> -		return -EBUSY;
> -
>  	node = mas_mn(mas);
>  	mt = mte_node_type(mas->node);
>  	pivots = ma_pivots(node, mt);
> -- 
> 2.34.1
> 



More information about the maple-tree mailing list