block: use the right type for stub rq_integrity_vec()

commit 69b6517687a4b1fb250bd8c9c193a0a304c8ba17 upstream.

For !CONFIG_BLK_DEV_INTEGRITY, rq_integrity_vec() wasn't updated
properly. Fix it up.

Fixes: cf546dd289e0 ("block: change rq_integrity_vec to respect the iterator")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Cc: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h
index d16dd24719841f415a7a84c4a804aa10e125a53f..9fc4fed9a19f82fd3d87f58aea3873ed807c6054 100644 (file)
--- a/include/linux/blk-integrity.h
+++ b/include/linux/blk-integrity.h
@@ -166,7 +166,7 @@ static inline int blk_integrity_rq(struct request *rq)
        return 0;
 }
 
-static inline struct bio_vec *rq_integrity_vec(struct request *rq)
+static inline struct bio_vec rq_integrity_vec(struct request *rq)
 {
        /* the optimizer will remove all calls to this function */
        return (struct bio_vec){ };