Delay the point of error injection a bit so that we have a single site in blk-core.c after more of the submission side checks and blkcg throttling. This allows to make should_fail_bio static in blk-core.c.
Signed-off-by: Christoph Hellwig <[email protected]> --- block/blk-core.c | 6 +++++- block/blk-merge.c | 5 +---- block/blk.h | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 3a23af3e26a9..f35e0d3fb127 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -539,7 +539,7 @@ static inline void bio_check_ro(struct bio *bio) } } -int should_fail_bio(struct bio *bio) +static int should_fail_bio(struct bio *bio) { if (should_fail_request(bdev_whole(bio->bi_bdev), bio->bi_iter.bi_size)) return -EIO; @@ -723,6 +723,10 @@ static void __submit_bio_noacct_mq(struct bio *bio) void submit_bio_noacct_nocheck(struct bio *bio, bool split) { + if (should_fail_bio(bio)) { + bio_io_error(bio); + return; + } blk_cgroup_bio_start(bio); if (!bio_flagged(bio, BIO_TRACE_COMPLETION)) { diff --git a/block/blk-merge.c b/block/blk-merge.c index 7cc82a7a6f4e..b44f8ae849b8 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -130,11 +130,8 @@ struct bio *bio_submit_split_bioset(struct bio *bio, unsigned int split_sectors, trace_block_split(split, bio->bi_iter.bi_sector); WARN_ON_ONCE(bio_zone_write_plugging(bio)); - if (should_fail_bio(bio)) - bio_io_error(bio); - else if (!blk_throtl_bio(bio)) + if (!blk_throtl_bio(bio)) submit_bio_noacct_nocheck(bio, true); - return split; } EXPORT_SYMBOL_GPL(bio_submit_split_bioset); diff --git a/block/blk.h b/block/blk.h index bf1a80493ff1..889a39589356 100644 --- a/block/blk.h +++ b/block/blk.h @@ -646,7 +646,6 @@ extern const struct address_space_operations def_blk_aops; int disk_register_independent_access_ranges(struct gendisk *disk); void disk_unregister_independent_access_ranges(struct gendisk *disk); -int should_fail_bio(struct bio *bio); #ifdef CONFIG_FAIL_MAKE_REQUEST bool should_fail_request(struct block_device *part, unsigned int bytes); #else /* CONFIG_FAIL_MAKE_REQUEST */ -- 2.53.0
