Commit bdb7d420 authored by Miaohe Lin's avatar Miaohe Lin Committed by Jens Axboe

block: remove unneeded return value of bio_check_ro()

bio_check_ro() always return false now. Remove this unneeded return value
and cleanup the sole caller. No functional change intended.
Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Link: https://lore.kernel.org/r/20220905102754.1942-1-linmiaohe@huawei.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6d5e8d21
...@@ -487,18 +487,15 @@ static int __init fail_make_request_debugfs(void) ...@@ -487,18 +487,15 @@ static int __init fail_make_request_debugfs(void)
late_initcall(fail_make_request_debugfs); late_initcall(fail_make_request_debugfs);
#endif /* CONFIG_FAIL_MAKE_REQUEST */ #endif /* CONFIG_FAIL_MAKE_REQUEST */
static inline bool bio_check_ro(struct bio *bio) static inline void bio_check_ro(struct bio *bio)
{ {
if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) { if (op_is_write(bio_op(bio)) && bdev_read_only(bio->bi_bdev)) {
if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) if (op_is_flush(bio->bi_opf) && !bio_sectors(bio))
return false; return;
pr_warn("Trying to write to read-only block-device %pg\n", pr_warn("Trying to write to read-only block-device %pg\n",
bio->bi_bdev); bio->bi_bdev);
/* Older lvm-tools actually trigger this */ /* Older lvm-tools actually trigger this */
return false;
} }
return false;
} }
static noinline int should_fail_bio(struct bio *bio) static noinline int should_fail_bio(struct bio *bio)
...@@ -722,8 +719,7 @@ void submit_bio_noacct(struct bio *bio) ...@@ -722,8 +719,7 @@ void submit_bio_noacct(struct bio *bio)
if (should_fail_bio(bio)) if (should_fail_bio(bio))
goto end_io; goto end_io;
if (unlikely(bio_check_ro(bio))) bio_check_ro(bio);
goto end_io;
if (!bio_flagged(bio, BIO_REMAPPED)) { if (!bio_flagged(bio, BIO_REMAPPED)) {
if (unlikely(bio_check_eod(bio))) if (unlikely(bio_check_eod(bio)))
goto end_io; goto end_io;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment