Commit cbc1532d authored by Keith Busch's avatar Keith Busch Committed by Mikulas Patocka
Browse files

dm-integrity: always set the io hints 



Don't depend on the defaults to be what is desired if the integrity
device was set up with 512b sector size. Always set the queue limits to
be at least what the device mapper wants.

Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent 6ebf3b6c

drivers/md/dm-integrity.c

+8 −13
Original line number Diff line number Diff line
@@ -4046,19 +4046,14 @@ static void dm_integrity_io_hints(struct dm_target *ti, struct queue_limits *lim 
{

	struct dm_integrity_c *ic = ti->private;



	if (ic->sectors_per_block > 1) {

		limits->logical_block_size =

				max(limits->logical_block_size,

	limits->logical_block_size = max(limits->logical_block_size,

			    ic->sectors_per_block << SECTOR_SHIFT);

		limits->physical_block_size =

				max(limits->physical_block_size,

	limits->physical_block_size = max(limits->physical_block_size,

			    ic->sectors_per_block << SECTOR_SHIFT);

		limits->io_min =

				max(limits->io_min,

	limits->io_min = max(limits->io_min,

			    ic->sectors_per_block << SECTOR_SHIFT);

	limits->dma_alignment = limits->logical_block_size - 1;

	limits->discard_granularity = ic->sectors_per_block << SECTOR_SHIFT;

	}



	if (!ic->internal_hash) {

		struct blk_integrity *bi = &limits->integrity;