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>

diff --git a/fs/ntfs3/bitmap.c b/fs/ntfs3/bitmap.c
index 5d44ceac855b7477afc0aa5e8e418bea881fd070..e92bbd754365ed3bc64559cfed0865ef36eec648 100644 (file)
--- 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 488e6c3e5acc8f115f1968584db497ea99d9798c..d56e275db73ed94891f12a4655fc71fdfd0de933 100644 (file)
--- 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);
 }
 
 /**