From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Josef Bacik <josef@toxicpanda.com>,
Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Coly Li <colyli@suse.de>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
linux-um@lists.infradead.org, linux-block@vger.kernel.org,
nbd@other.debian.org, linux-bcache@vger.kernel.org,
linux-mtd@lists.infradead.org
Subject: [PATCH 1/9] block: remove two comments in bio_split_discard
Date: Thu, 28 Dec 2023 07:55:37 +0000 [thread overview]
Message-ID: <20231228075545.362768-2-hch@lst.de> (raw)
In-Reply-To: <20231228075545.362768-1-hch@lst.de>
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>
---
block/blk-merge.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 65e75efa9bd366..2d470cf2173e29 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;
--
2.39.2
next prev parent reply other threads:[~2023-12-28 7:56 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-28 7:55 provide a sane discard_granularity default Christoph Hellwig
2023-12-28 7:55 ` Christoph Hellwig [this message]
2023-12-28 7:55 ` [PATCH 2/9] bcache: discard_granularity should not be smaller than a sector Christoph Hellwig
2023-12-28 7:55 ` [PATCH 3/9] block: default the discard granularity to sector size Christoph Hellwig
2024-01-02 22:11 ` John Pittman
2024-01-03 7:57 ` Christoph Hellwig
2023-12-28 7:55 ` [PATCH 4/9] ubd: use the default discard granularity Christoph Hellwig
2023-12-28 11:10 ` Richard Weinberger
2023-12-28 7:55 ` [PATCH 5/9] nbd: " Christoph Hellwig
2023-12-28 7:55 ` [PATCH 6/9] null_blk: " Christoph Hellwig
2023-12-28 7:55 ` [PATCH 7/9] zram: " Christoph Hellwig
2024-01-02 1:15 ` Sergey Senozhatsky
2024-01-02 15:40 ` Jens Axboe
2024-01-02 15:44 ` Jens Axboe
2024-01-02 15:47 ` Jens Axboe
2024-01-06 1:32 ` Sergey Senozhatsky
2023-12-28 7:55 ` [PATCH 8/9] bcache: " Christoph Hellwig
2024-01-05 7:03 ` Coly Li
2023-12-28 7:55 ` [PATCH 9/9] mtd_blkdevs: " Christoph Hellwig
2023-12-28 11:09 ` Richard Weinberger
2023-12-29 15:44 ` provide a sane discard_granularity default Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231228075545.362768-2-hch@lst.de \
--to=hch@lst.de \
--cc=anton.ivanov@cambridgegreys.com \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=josef@toxicpanda.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=minchan@kernel.org \
--cc=miquel.raynal@bootlin.com \
--cc=nbd@other.debian.org \
--cc=richard@nod.at \
--cc=senozhatsky@chromium.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).