Commit 32e9ad4d authored by Li Nan's avatar Li Nan Committed by Jens Axboe
Browse files

badblocks: attempt to merge adjacent badblocks during ack_all_badblocks 



If ack and unack badblocks are adjacent, they will not be merged and will
remain as two separate badblocks. Even after the bad blocks are written
to disk and both become ack, they will still remain as two independent
bad blocks. This is not ideal as it wastes the limited space for
badblocks. Therefore, during ack_all_badblocks(), attempt to merge
badblocks if they are adjacent.

Fixes: aa511ff8 ("badblocks: switch to the improved badblock handling code")
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Acked-by: default avatarColy Li <colyli@kernel.org>
Link: https://lore.kernel.org/r/20250227075507.151331-4-zhengqixing@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 270b68fe

block/badblocks.c

+5 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,11 @@ void ack_all_badblocks(struct badblocks *bb) 
				p[i] = BB_MAKE(start, len, 1);

			}

		}



		for (i = 0; i < bb->count ; i++)

			while (try_adjacent_combine(bb, i))

				;



		bb->unacked_exist = 0;

	}

	write_sequnlock_irq(&bb->lock);