diff options
| author | Yury Norov <yury.norov@gmail.com> | 2022-09-17 20:07:11 -0700 |
|---|---|---|
| committer | Yury Norov <yury.norov@gmail.com> | 2022-09-26 12:19:12 -0700 |
| commit | 70a1cb106d9410f1f37e0261728e46722b74c29f (patch) | |
| tree | 8ea8f66801464c3a08292adbc1c8096cd8047136 | |
| parent | 6333cb31a711cc709b6a960d082e04546f4459ee (diff) | |
| download | linux-70a1cb106d9410f1f37e0261728e46722b74c29f.tar.gz | |
lib/bitmap: don't call __bitmap_weight() in kernel code
__bitmap_weight() is not to be used directly in the kernel code because it's a helper for bitmap_weight(). Switch everything to bitmap_weight(). Signed-off-by: Yury Norov <yury.norov@gmail.com>
| -rw-r--r-- | fs/ntfs3/bitmap.c | 4 | ||||
| -rw-r--r-- | lib/bitmap.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c index 5d44ceac855b..e92bbd754365 100644 --- a/fs/ntfs3/bitmap.c +++ b/fs/ntfs3/bitmap.c @@ -560,7 +560,7 @@ static int wnd_rescan(struct wnd_bitmap *wnd) buf = (ulong *)bh->b_data; - used = __bitmap_weight(buf, wbits); + used = bitmap_weight(buf, wbits); if (used < wbits) { frb = wbits - used; wnd->free_bits[iw] = frb; @@ -1364,7 +1364,7 @@ int wnd_extend(struct wnd_bitmap *wnd, size_t new_bits) buf = (ulong *)bh->b_data; __bitmap_clear(buf, b0, blocksize * 8 - b0); - frb = wbits - __bitmap_weight(buf, wbits); + frb = wbits - bitmap_weight(buf, wbits); wnd->total_zeroes += frb - wnd->free_bits[iw]; wnd->free_bits[iw] = frb; diff --git a/lib/bitmap.c b/lib/bitmap.c index 488e6c3e5acc..d56e275db73e 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -953,7 +953,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, unsigned int pos, unsigne if (pos >= nbits || !test_bit(pos, buf)) return -1; - return __bitmap_weight(buf, pos); + return bitmap_weight(buf, pos); } /** |