| Message ID | 20220304180105.409765-2-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] block: fix and cleanup bio_check_ro | expand |
On 3/4/22 10:00, Christoph Hellwig wrote: > 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> > --- Looks good. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
diff --git a/block/blk-core.c b/block/blk-core.c index 94bf37f8e61d2..34e1b7fdb7c89 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -580,14 +580,10 @@ late_initcall(fail_make_request_debugfs); static inline bool bio_check_ro(struct bio *bio) { if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) { - char b[BDEVNAME_SIZE]; - 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", - bio_devname(bio, b), bio->bi_bdev->bd_partno); + pr_warn("Trying to write to read-only block-device %pg\n", + bio->bi_bdev); /* Older lvm-tools actually trigger this */ return false; }
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> --- block/blk-core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)