dm integrity: fix error reporting in bitmap mode after creation (e27fec66) · Commits · 戴 / test

The dm-integrity target did not report errors in bitmap mode just after creation. The reason is that the function integrity_recalc didn't clean up ic->recalc_bitmap as it proceeded with recalculation. Fix this by updating the bitmap accordingly -- the double shift serves to rounddown. Signed-off-by:

Mikulas Patocka <mpatocka@redhat.com> Fixes: ("dm integrity: add a bitmap mode") Cc: stable@vger.kernel.org # v5.2+ Signed-off-by:

Mike Snitzer <snitzer@redhat.com>

drivers/md/dm-integrity.c

+12 −0

Original line number	Diff line number	Diff line
		@@ -2487,6 +2487,7 @@ next_chunk:
		range.logical_sector = le64_to_cpu(ic->sb->recalc_sector);
		if (unlikely(range.logical_sector >= ic->provided_data_sectors)) {
		if (ic->mode == 'B') {
		block_bitmap_op(ic, ic->recalc_bitmap, 0, ic->provided_data_sectors, BITMAP_OP_CLEAR);
		DEBUG_print("queue_delayed_work: bitmap_flush_work\n");
		queue_delayed_work(ic->commit_wq, &ic->bitmap_flush_work, 0);
		}
		@@ -2564,6 +2565,17 @@ next_chunk:
		goto err;
		}

		if (ic->mode == 'B') {
		sector_t start, end;
		start = (range.logical_sector >>
		(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit)) <<
		(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit);
		end = ((range.logical_sector + range.n_sectors) >>
		(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit)) <<
		(ic->sb->log2_sectors_per_block + ic->log2_blocks_per_bitmap_bit);
		block_bitmap_op(ic, ic->recalc_bitmap, start, end - start, BITMAP_OP_CLEAR);
		}

		advance_and_next:
		cond_resched();

Admin message