From: Keith Busch <[email protected]> No functional change; purely introducing a convenience function.
Signed-off-by: Keith Busch <[email protected]> --- block/blk-merge.c | 4 ++-- include/linux/blkdev.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index ab1161ca69f1e..c93170f340977 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -122,7 +122,7 @@ struct bio *bio_submit_split_bioset(struct bio *bio, unsigned int split_sectors, struct bio *split = bio_split(bio, split_sectors, GFP_NOIO, bs); if (IS_ERR(split)) { - bio_endio_status(bio, errno_to_blk_status(PTR_ERR(split))); + bio_endio_errno(bio, PTR_ERR(split)); return NULL; } @@ -142,7 +142,7 @@ EXPORT_SYMBOL_GPL(bio_submit_split_bioset); static struct bio *bio_submit_split(struct bio *bio, int split_sectors) { if (unlikely(split_sectors < 0)) { - bio_endio_status(bio, errno_to_blk_status(split_sectors)); + bio_endio_errno(bio, split_sectors); return NULL; } diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9213a5716f95a..88e4bd88c3e28 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1047,6 +1047,11 @@ extern const char *blk_op_str(enum req_op op); int blk_status_to_errno(blk_status_t status); blk_status_t errno_to_blk_status(int errno); +static inline void bio_endio_errno(struct bio *bio, int errno) +{ + bio_endio_status(bio, errno_to_blk_status(errno)); +} + /* only poll the hardware once, don't continue until a completion was found */ #define BLK_POLL_ONESHOT (1 << 0) int bio_poll(struct bio *bio, struct io_comp_batch *iob, unsigned int flags); -- 2.52.0
