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>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 65e75efa9bd3663c787b4b0c5b310479419467a2..2d470cf2173e29c540161401bd566942f049f27c 100644 (file)
--- 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;