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

loop: Simplify discard granularity calc 



A bdev discard granularity is always at least SECTOR_SIZE, so don't check
for a zero value.

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


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

drivers/block/loop.c

+1 −2
Original line number Diff line number Diff line
@@ -789,8 +789,7 @@ static void loop_config_discard(struct loop_device *lo, 
		struct block_device *bdev = I_BDEV(inode);



		max_discard_sectors = bdev_write_zeroes_sectors(bdev);

		granularity = bdev_discard_granularity(bdev) ?:

			bdev_physical_block_size(bdev);

		granularity = bdev_discard_granularity(bdev);



	/*

	 * We use punch hole to reclaim the free space used by the