Patch "block: use proper return value from bio_failfast()" has been added to the 6.2-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    block: use proper return value from bio_failfast()

to the 6.2-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     block-use-proper-return-value-from-bio_failfast.patch
and it can be found in the queue-6.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5384c09f4a604a1bd50145c68d13460ecb15d4e1
Author: Jens Axboe <axboe@xxxxxxxxx>
Date:   Thu Feb 16 19:39:15 2023 -0700

    block: use proper return value from bio_failfast()
    
    [ Upstream commit f3ca73862453ac1e64fc6968a14bf66d839cd2d8 ]
    
    kernel test robot complains about a type mismatch:
    
       block/blk-merge.c:984:42: sparse:     expected restricted blk_opf_t const [usertype] ff
       block/blk-merge.c:984:42: sparse:     got unsigned int
       block/blk-merge.c:1010:42: sparse: sparse: incorrect type in initializer (different base types) @@     expected restricted blk_opf_t const [usertype] ff @@     got unsigned int @@
       block/blk-merge.c:1010:42: sparse:     expected restricted blk_opf_t const [usertype] ff
       block/blk-merge.c:1010:42: sparse:     got unsigned int
    
    because bio_failfast() is return an unsigned int rather than the
    appropriate blk_opt_f type. Fix it up.
    
    Fixes: 3ce6a115980c ("block: sync mixed merged request's failfast with 1st bio's")
    Reported-by: kernel test robot <lkp@xxxxxxxxx>
    Link: https://lore.kernel.org/oe-kbuild-all/202302170743.GXypM9Rt-lkp@xxxxxxxxx/
    Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 30e4a99c2276b..808b58129d3e4 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -757,7 +757,7 @@ void blk_rq_set_mixed_merge(struct request *rq)
 	rq->rq_flags |= RQF_MIXED_MERGE;
 }
 
-static inline unsigned int bio_failfast(const struct bio *bio)
+static inline blk_opf_t bio_failfast(const struct bio *bio)
 {
 	if (bio->bi_opf & REQ_RAHEAD)
 		return REQ_FAILFAST_MASK;