From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 27 Jun 2024 01:01:58 +0000 (-0600)
Subject: block: use the right type for stub rq_integrity_vec()
X-Git-Tag: v6.10.5~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3118c43a563d5200cf398b6f81bc939e83b881f2;p=thirdparty%2Fkernel%2Fstable.git

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 d16dd24719841..9fc4fed9a19f8 100644
--- 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){ };