]> git.baikalelectronics.ru Git - kernel.git/commitdiff
block: remove unneeded return value of bio_check_ro()
authorMiaohe Lin <linmiaohe@huawei.com>
Mon, 5 Sep 2022 10:27:54 +0000 (18:27 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 5 Sep 2022 17:45:35 +0000 (11:45 -0600)
bio_check_ro() always return false now. Remove this unneeded return value
and cleanup the sole caller. No functional change intended.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Link: https://lore.kernel.org/r/20220905102754.1942-1-linmiaohe@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c

index a0d1104c5590c16b9484c925ac387b571e1f15ed..fe6b27e3a513f88be8ebc170786d825d0e00a97d 100644 (file)
@@ -487,18 +487,15 @@ static int __init fail_make_request_debugfs(void)
 late_initcall(fail_make_request_debugfs);
 #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_flush(bio->bi_opf) && !bio_sectors(bio))
-                       return false;
+                       return;
                pr_warn("Trying to write to read-only block-device %pg\n",
                        bio->bi_bdev);
                /* Older lvm-tools actually trigger this */
-               return false;
        }
-
-       return false;
 }
 
 static noinline int should_fail_bio(struct bio *bio)
@@ -722,8 +719,7 @@ void submit_bio_noacct(struct bio *bio)
 
        if (should_fail_bio(bio))
                goto end_io;
-       if (unlikely(bio_check_ro(bio)))
-               goto end_io;
+       bio_check_ro(bio);
        if (!bio_flagged(bio, BIO_REMAPPED)) {
                if (unlikely(bio_check_eod(bio)))
                        goto end_io;