Re: [PATCH v2 2/2] maple_tree: remove sanity check from mas_wr_slot_store()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Wei Yang <richard.weiyang@xxxxxxxxx> [241016 21:58]:
> After commit 5d659bbb52a2 ("maple_tree: introduce mas_wr_store_type()"),
> the check here is redundant.
> 
> Let's remove it.
> 
> Signed-off-by: Wei Yang <richard.weiyang@xxxxxxxxx>
> CC: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>
> CC: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
> CC: Lorenzo Stoakes <lorenzo.stoakes@xxxxxxxxxx>
> Reviewed-by: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>

Reviewed-by: Liam R. Howlett <Liam.Howlett@xxxxxxxxxx>

> 
> ---
> v2: add a WARN_ON_ONCE() as suggested by Liam
> ---
>  lib/maple_tree.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/lib/maple_tree.c b/lib/maple_tree.c
> index b26f8df09588..54dd0e256315 100644
> --- a/lib/maple_tree.c
> +++ b/lib/maple_tree.c
> @@ -3805,7 +3805,8 @@ static inline void mas_wr_slot_store(struct ma_wr_state *wr_mas)
>  			wr_mas->pivots[offset] = mas->index - 1;
>  			mas->offset++; /* Keep mas accurate. */
>  		}
> -	} else if (!mt_in_rcu(mas->tree)) {
> +	} else {
> +		WARN_ON_ONCE(mt_in_rcu(mas->tree));
>  		/*
>  		 * Expand the range, only partially overwriting the previous and
>  		 * next ranges
> @@ -3815,8 +3816,6 @@ static inline void mas_wr_slot_store(struct ma_wr_state *wr_mas)
>  		wr_mas->pivots[offset] = mas->index - 1;
>  		wr_mas->pivots[offset + 1] = mas->last;
>  		mas->offset++; /* Keep mas accurate. */
> -	} else {
> -		return;
>  	}
>  
>  	trace_ma_write(__func__, mas, 0, wr_mas->entry);
> -- 
> 2.34.1
> 




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [eCos]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux