diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-03-04 19:00:56 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-07 06:42:33 -0700 |
| commit | 57e95e4670d1126c103305bcf34a9442f49f6d6a (patch) | |
| tree | 477fcad41357c456c524efb14d3fcbc1e2ae7549 /block/blk-core.c | |
| parent | ab552fcb17cc9e4afe0e4ac4df95fc7b30e8490a (diff) | |
| download | linux-57e95e4670d1126c103305bcf34a9442f49f6d6a.tar.gz | |
block: fix and cleanup bio_check_ro
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>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 94bf37f8e61d..34e1b7fdb7c8 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; } |