From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Mike Snitzer <snitzer@kernel.org>,
dm-devel@redhat.com, linux-block@vger.kernel.org
Subject: [PATCH 2/3] block: simplify the check for flushes in bio_check_ro
Date: Thu, 1 Jun 2023 09:28:28 +0200 [thread overview]
Message-ID: <20230601072829.1258286-3-hch@lst.de> (raw)
In-Reply-To: <20230601072829.1258286-1-hch@lst.de>
The only writes without no sectors are pure flush requests, so drop
the extra op_is_flush check.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-core.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 2ae22bebeb3ee1..4ba243968e41eb 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -494,9 +494,8 @@ late_initcall(fail_make_request_debugfs);
static inline void bio_check_ro(struct bio *bio)
{
- if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) {
- if (op_is_flush(bio->bi_opf) && !bio_sectors(bio))
- return;
+ if (op_is_write(bio_op(bio)) && bio_sectors(bio) &&
+ bdev_read_only(bio->bi_bdev)) {
pr_warn("Trying to write to read-only block-device %pg\n",
bio->bi_bdev);
/* Older lvm-tools actually trigger this */
--
2.39.2
next prev parent reply other threads:[~2023-06-01 7:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-01 7:28 enforce read-only state at the block layer Christoph Hellwig
2023-06-01 7:28 ` [PATCH 1/3] block: remove a duplicate bdev_read_only declaration Christoph Hellwig
2023-06-01 7:28 ` Christoph Hellwig [this message]
2023-06-01 7:28 ` [PATCH 3/3] block: fail writes to read-only devices Christoph Hellwig
2023-06-02 1:02 ` Linus Torvalds
2023-06-02 15:41 ` Christoph Hellwig
2023-06-02 15:56 ` Linus Torvalds
2023-06-06 16:13 ` Mike Snitzer
2023-06-06 16:11 ` enforce read-only state at the block layer Mike Snitzer
2023-06-07 5:33 ` Christoph Hellwig
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=20230601072829.1258286-3-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=dm-devel@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=snitzer@kernel.org \
--cc=torvalds@linux-foundation.org \
/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