diff options
| author | John Garry <john.g.garry@oracle.com> | 2024-11-01 09:22:15 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-05-18 08:24:56 +0200 |
| commit | 722f6dece719e5a18ec949f4774eda302ec6d68c (patch) | |
| tree | e607f6f257e2b0c16c2d1a67367856f5a155731b /drivers/block | |
| parent | 02a77b3020a2b8777ead56468e8f1421e640ebd6 (diff) | |
| download | linux-722f6dece719e5a18ec949f4774eda302ec6d68c.tar.gz linux-722f6dece719e5a18ec949f4774eda302ec6d68c.tar.bz2 linux-722f6dece719e5a18ec949f4774eda302ec6d68c.zip | |
loop: Simplify discard granularity calc
[ 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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/loop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index b3355a8d7896..1f55ddef53f3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -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 |