Commit 850173ca authored Mar 04, 2022 by Christoph Hellwig Committed by sanglipeng Aug 17, 2023

block: fix and cleanup bio_check_ro

stable inclusion
from stable-v5.10.166
commit 2eca102b350f5dd1870e615fb660dc0cc498b4db
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2eca102b350f5dd1870e615fb660dc0cc498b4db



--------------------------------

commit 57e95e46 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>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent f6ff4bfb

block/blk-core.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -713,9 +713,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,
		"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;