[PATCH v4 3/8] bitmap: fix opencoded bitmap_allocate_region()

From: Yury Norov
Date: Mon Aug 28 2023 - 22:40:25 EST


bitmap_find_region() opencodes bitmap_allocate_region(). Fix it.

CC: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
CC: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
---
lib/bitmap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/bitmap.c b/lib/bitmap.c
index 250715260d95..3c069944dd83 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1315,10 +1315,8 @@ int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order)
unsigned int pos, end; /* scans bitmap by regions of size order */

for (pos = 0; (end = pos + BIT(order)) <= bits; pos = end) {
- if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
- continue;
- __reg_op(bitmap, pos, order, REG_OP_ALLOC);
- return pos;
+ if (!bitmap_allocate_region(bitmap, pos, order))
+ return pos;
}
return -ENOMEM;
}
--
2.39.2