Commit 30dd3478 authored by Joseph Qi's avatar Joseph Qi Committed by Andrew Morton
Browse files

ocfs2: correctly use ocfs2_find_next_zero_bit() 

If no bits are zero, ocfs2_find_next_zero_bit() will return max size, so
check the return value with -1 is meaningless.  Correct this usage and
cleanup the code.

Link: https://lkml.kernel.org/r/20240314021713.240796-1-joseph.qi@linux.alibaba.com


Signed-off-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarHeming Zhao <heming.zhao@suse.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 0bbac3fa

fs/ocfs2/localalloc.c

+6 −13
Original line number Diff line number Diff line
@@ -863,14 +863,8 @@ static int ocfs2_local_alloc_find_clear_bits(struct ocfs2_super *osb, 


	numfound = bitoff = startoff = 0;

	left = le32_to_cpu(alloc->id1.bitmap1.i_total);

	while ((bitoff = ocfs2_find_next_zero_bit(bitmap, left, startoff)) != -1) {

		if (bitoff == left) {

			/* mlog(0, "bitoff (%d) == left", bitoff); */

			break;

		}

		/* mlog(0, "Found a zero: bitoff = %d, startoff = %d, "

		   "numfound = %d\n", bitoff, startoff, numfound);*/



	while ((bitoff = ocfs2_find_next_zero_bit(bitmap, left, startoff)) <

	       left) {

		/* Ok, we found a zero bit... is it contig. or do we

		 * start over?*/

		if (bitoff == startoff) {
@@ -976,9 +970,9 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, 
	start = count = 0;

	left = le32_to_cpu(alloc->id1.bitmap1.i_total);



	while ((bit_off = ocfs2_find_next_zero_bit(bitmap, left, start))

	       != -1) {

		if ((bit_off < left) && (bit_off == start)) {

	while ((bit_off = ocfs2_find_next_zero_bit(bitmap, left, start)) <

	       left) {

		if (bit_off == start) {

			count++;

			start++;

			continue;
@@ -1002,8 +996,7 @@ static int ocfs2_sync_local_to_main(struct ocfs2_super *osb, 
				goto bail;

			}

		}

		if (bit_off >= left)

			break;



		count = 1;

		start = bit_off + 1;

	}

fs/ocfs2/reservations.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int ocfs2_resmap_find_free_bits(struct ocfs2_reservation_map *resmap, 


	start = search_start;

	while ((offset = ocfs2_find_next_zero_bit(bitmap, resmap->m_bitmap_len,

						 start)) != -1) {

					start)) < resmap->m_bitmap_len) {

		/* Search reached end of the region */

		if (offset >= (search_start + search_len))

			break;

fs/ocfs2/suballoc.c

+2 −4
Original line number Diff line number Diff line
@@ -1290,10 +1290,8 @@ static int ocfs2_block_group_find_clear_bits(struct ocfs2_super *osb, 
	found = start = best_offset = best_size = 0;

	bitmap = bg->bg_bitmap;



	while((offset = ocfs2_find_next_zero_bit(bitmap, total_bits, start)) != -1) {

		if (offset == total_bits)

			break;



	while ((offset = ocfs2_find_next_zero_bit(bitmap, total_bits, start)) <

	       total_bits) {

		if (!ocfs2_test_bg_bit_allocatable(bg_bh, offset)) {

			/* We found a zero, but we can't use it as it

			 * hasn't been put to disk yet! */