tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loop: Simplify discard granularity calc

Browse Source 
[ Upstream commit d47de6ac8842327ae1c782670283450159c55d5b ]

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

Suggested-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20241101092215.422428-1-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Stable-dep-of: f5c84eff634b ("loop: Add sanity check for read/write_iter")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
John Garry
2024-11-01 09:22:15 +00:00
committed by Greg Kroah-Hartman
parent 02a77b3020
commit 722f6dece7
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/loop.c
View File

@@ -713,8 +713,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