Commit 928a5dd3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20231228075545.362768-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d6b9f4e6

block/blk-merge.c

+1 −5
Original line number Diff line number Diff line
@@ -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;