Commit 70a1cb10 authored by Yury Norov's avatar Yury Norov
Browse files

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: default avatarYury Norov <yury.norov@gmail.com>
parent 6333cb31

fs/ntfs3/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

lib/bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/**