diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-03-04 19:00:56 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 07:49:41 +0100 |
| commit | cc42c752fee620e43d34f000c23037d463a3f488 (patch) | |
| tree | b4a4f02b764717b70ec02a8bc54c11277f0f53e9 /block | |
| parent | 01687e35df44dd09cc6943306db35d9efc507907 (diff) | |
| download | linux-stable-cc42c752fee620e43d34f000c23037d463a3f488.tar.gz linux-stable-cc42c752fee620e43d34f000c23037d463a3f488.tar.bz2 linux-stable-cc42c752fee620e43d34f000c23037d463a3f488.zip | |
block: fix and cleanup bio_check_ro
commit 57e95e4670d1126c103305bcf34a9442f49f6d6a upstream.
Don't use a WARN_ON when printing a potentially user triggered
condition. Also don't print the partno when the block device name
already includes it, and use the %pg specifier to simplify printing
the block device name.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220304180105.409765-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 80f3e729fdd4..4fbf915d9cb0 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2179,10 +2179,7 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) return false; - - WARN_ONCE(1, - "generic_make_request: Trying to write " - "to read-only block-device %s (partno %d)\n", + pr_warn("Trying to write to read-only block-device %s (partno %d)\n", bio_devname(bio, b), part->partno); /* Older lvm-tools actually trigger this */ return false; |