Commit 0a94a469 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Mikulas Patocka
Browse files

dm: stop using blk_limits_io_{min,opt} 



Remove use of the blk_limits_io_{min,opt} and assign the values directly
to the queue_limits structure.  For the io_opt this is a completely
mechanical change, for io_min it removes flooring the limit to the
physical and logical block size in the particular caller.  But as
blk_validate_limits will do the same later when actually applying the
limits, there still is no change in overall behavior.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent 0d815e34

drivers/md/dm-cache-target.c

+2 −2
Original line number Diff line number Diff line
@@ -3416,8 +3416,8 @@ static void cache_io_hints(struct dm_target *ti, struct queue_limits *limits) 
	 */

	if (io_opt_sectors < cache->sectors_per_block ||

	    do_div(io_opt_sectors, cache->sectors_per_block)) {

		blk_limits_io_min(limits, cache->sectors_per_block << SECTOR_SHIFT);

		blk_limits_io_opt(limits, cache->sectors_per_block << SECTOR_SHIFT);

		limits->io_min = cache->sectors_per_block << SECTOR_SHIFT;

		limits->io_opt = cache->sectors_per_block << SECTOR_SHIFT;

	}



	disable_passdown_if_not_supported(cache);

drivers/md/dm-clone-target.c

+2 −2
Original line number Diff line number Diff line
@@ -2073,8 +2073,8 @@ static void clone_io_hints(struct dm_target *ti, struct queue_limits *limits) 
	 */

	if (io_opt_sectors < clone->region_size ||

	    do_div(io_opt_sectors, clone->region_size)) {

		blk_limits_io_min(limits, clone->region_size << SECTOR_SHIFT);

		blk_limits_io_opt(limits, clone->region_size << SECTOR_SHIFT);

		limits->io_min = clone->region_size << SECTOR_SHIFT;

		limits->io_opt = clone->region_size << SECTOR_SHIFT;

	}



	disable_passdown_if_not_supported(clone);

drivers/md/dm-ebs-target.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void ebs_io_hints(struct dm_target *ti, struct queue_limits *limits) 
	limits->logical_block_size = to_bytes(ec->e_bs);

	limits->physical_block_size = to_bytes(ec->u_bs);

	limits->alignment_offset = limits->physical_block_size;

	blk_limits_io_min(limits, limits->logical_block_size);

	limits->io_min = limits->logical_block_size;

}



static int ebs_iterate_devices(struct dm_target *ti,

drivers/md/dm-era-target.c

+2 −2
Original line number Diff line number Diff line
@@ -1733,8 +1733,8 @@ static void era_io_hints(struct dm_target *ti, struct queue_limits *limits) 
	 */

	if (io_opt_sectors < era->sectors_per_block ||

	    do_div(io_opt_sectors, era->sectors_per_block)) {

		blk_limits_io_min(limits, 0);

		blk_limits_io_opt(limits, era->sectors_per_block << SECTOR_SHIFT);

		limits->io_min = 0;

		limits->io_opt = era->sectors_per_block << SECTOR_SHIFT;

	}

}

drivers/md/dm-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -3471,7 +3471,7 @@ static void dm_integrity_io_hints(struct dm_target *ti, struct queue_limits *lim 
	if (ic->sectors_per_block > 1) {

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

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

		blk_limits_io_min(limits, ic->sectors_per_block << SECTOR_SHIFT);

		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;

	}