On Fri, 11 Feb 2022 at 00:55, Yury Norov <yury.norov@xxxxxxxxx> wrote:
>
> msb_validate_used_block_bitmap() calls bitmap_weight() to compare the
> weight of bitmap with a given number. We can do it more efficiently with
> bitmap_weight_eq because conditional bitmap_weight may stop traversing the
> bitmap earlier, as soon as condition is (or can't be) met.
>
> Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
> Acked-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Acked-by: Shubhankar Kuranagatti <shubhankar.vk@xxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/memstick/core/ms_block.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
> index 0cda6c6baefc..5cdd987e78f7 100644
> --- a/drivers/memstick/core/ms_block.c
> +++ b/drivers/memstick/core/ms_block.c
> @@ -155,8 +155,8 @@ static int msb_validate_used_block_bitmap(struct msb_data *msb)
> for (i = 0; i < msb->zone_count; i++)
> total_free_blocks += msb->free_block_count[i];
>
> - if (msb->block_count - bitmap_weight(msb->used_blocks_bitmap,
> - msb->block_count) == total_free_blocks)
> + if (bitmap_weight_eq(msb->used_blocks_bitmap, msb->block_count,
> + msb->block_count - total_free_blocks))
> return 0;
>
> pr_err("BUG: free block counts don't match the bitmap");
> --
> 2.32.0
>
