Commit e924da7d authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

block: Drop granularity check in queue_limit_discard_alignment() 



lim->discard_granularity is always at least SECTOR_SIZE, so drop the
pointless check for granularity less than SECTOR_SIZE.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241112092144.4059847-1-john.g.garry@oracle.com


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

block/blk-settings.c

+0 −2
Original line number Diff line number Diff line
@@ -465,8 +465,6 @@ static unsigned int queue_limit_discard_alignment( 
	/* Why are these in bytes, not sectors? */

	alignment = lim->discard_alignment >> SECTOR_SHIFT;

	granularity = lim->discard_granularity >> SECTOR_SHIFT;

	if (!granularity)

		return 0;



	/* Offset of the partition start in 'granularity' sectors */

	offset = sector_div(sector, granularity);