diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-02-16 19:39:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-10 09:32:47 +0100 |
| commit | fba23dfd6f27044473eb9ddb0cdbbf2849d3eaa1 (patch) | |
| tree | c4c49d8b0814e2a9f56146870c68672392584a30 /block | |
| parent | a07836bc0a32e51af5e70bfc7014ba6e402db34f (diff) | |
| download | linux-stable-fba23dfd6f27044473eb9ddb0cdbbf2849d3eaa1.tar.gz linux-stable-fba23dfd6f27044473eb9ddb0cdbbf2849d3eaa1.tar.bz2 linux-stable-fba23dfd6f27044473eb9ddb0cdbbf2849d3eaa1.zip | |
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@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202302170743.GXypM9Rt-lkp@intel.com/
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 914da38523b5..17ac532105a9 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -747,7 +747,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; |