| Message ID | 20220123183925.1052919-31-yury.norov@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Sun, 23 Jan 2022 at 19:41, Yury Norov <yury.norov@gmail.com> 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 met. > > Signed-off-by: Yury Norov <yury.norov@gmail.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> 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.30.2 >
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");
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 met. Signed-off-by: Yury Norov <yury.norov@gmail.com> --- drivers/memstick/core/ms_block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)