Commit 4d1757f9 authored Mar 04, 2022 by Christoph Hellwig Committed by Greg Kroah-Hartman Feb 06, 2023

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>

parent 3a10a4d5

block/blk-core.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -793,10 +793,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;