block: fix and cleanup bio_check_ro

commit 602f0de3a2e26e8d81f5ff6cf45d2c1edc622c4d 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>

diff --git a/block/blk-core.c b/block/blk-core.c
index 5808baa950c3543b2218b20c13b992e45806d259..030de4fdf9b1d0b78fc85e8c5c13d2f0ab0ac5cf 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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;