summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJohn Garry <john.g.garry@oracle.com>2024-11-12 10:21:44 +0100
committerJens Axboe <axboe@kernel.dk>2024-11-19 17:09:47 +0100
commite924da7d6622b72f9eee78a3aad3e75b859da341 (patch)
tree663acb692c93ff7e764d9a0f1516042d1367ed58 /block
parentloop: Fix ABBA locking race (diff)
downloadlinux-e924da7d6622b72f9eee78a3aad3e75b859da341.tar.xz
linux-e924da7d6622b72f9eee78a3aad3e75b859da341.zip
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: John Garry <john.g.garry@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20241112092144.4059847-1-john.g.garry@oracle.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-settings.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 0fe16f987cde..2f1005da530c 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -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);