summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-12-28 07:55:37 +0000
committerJens Axboe <axboe@kernel.dk>2023-12-29 08:44:12 -0700
commit928a5dd3a849dc6d8298835bdcb25c360d41bccb (patch)
treec2b1e43c17e9a4071685d116d567a7bd105e90b6 /block
parentd6b9f4e6f7fb589d8024a31cc4883d15d0c8def4 (diff)
downloadlinux-stable-928a5dd3a849dc6d8298835bdcb25c360d41bccb.tar.gz
linux-stable-928a5dd3a849dc6d8298835bdcb25c360d41bccb.tar.bz2
linux-stable-928a5dd3a849dc6d8298835bdcb25c360d41bccb.zip
block: remove two comments in bio_split_discard
A zero discard_granularity is not treated the same as a single-block one, and not having any segments after taking alignment is perfectly fine and does not need a warning. Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20231228075545.362768-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-merge.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 65e75efa9bd3..2d470cf2173e 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -115,17 +115,13 @@ static struct bio *bio_split_discard(struct bio *bio,
*nsegs = 1;
- /* Zero-sector (unknown) and one-sector granularities are the same. */
granularity = max(lim->discard_granularity >> 9, 1U);
max_discard_sectors =
min(lim->max_discard_sectors, bio_allowed_max_sectors(lim));
max_discard_sectors -= max_discard_sectors % granularity;
-
- if (unlikely(!max_discard_sectors)) {
- /* XXX: warn */
+ if (unlikely(!max_discard_sectors))
return NULL;
- }
if (bio_sectors(bio) <= max_discard_sectors)
return NULL;