Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ddb1d4 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Greg Kroah-Hartman
Browse files

dm integrity: fix error reporting in bitmap mode after creation 



commit e27fec66f0a94e35a35548bd0b29ae616e62ec62 upstream.

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: default avatarMikulas Patocka <mpatocka@redhat.com>
Fixes: 468dfca3 ("dm integrity: add a bitmap mode")
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b30f628b

drivers/md/dm-integrity.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -2365,6 +2365,7 @@ static void integrity_recalc(struct work_struct *w) 
	range.logical_sector = le64_to_cpu(ic->sb->recalc_sector);

	range.logical_sector = le64_to_cpu(ic->sb->recalc_sector);

	if (unlikely(range.logical_sector >= ic->provided_data_sectors)) {

	if (unlikely(range.logical_sector >= ic->provided_data_sectors)) {

		if (ic->mode == 'B') {

		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");

			DEBUG_print("queue_delayed_work: bitmap_flush_work\n");

			queue_delayed_work(ic->commit_wq, &ic->bitmap_flush_work, 0);

			queue_delayed_work(ic->commit_wq, &ic->bitmap_flush_work, 0);

		}

		}
@@ -2442,6 +2443,17 @@ static void integrity_recalc(struct work_struct *w) 
		goto err;

		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:

advance_and_next:

	cond_resched();

	cond_resched();