block: use the right type for stub rq_integrity_vec()

axboe · gregkh · commit 3118c43a563d · 2024-08-14T15:34:36.000+02:00
commit 69b6517 upstream. For !CONFIG_BLK_DEV_INTEGRITY, rq_integrity_vec() wasn't updated properly. Fix it up. Fixes: cf546dd ("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
@@ -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){ };

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ static inline int blk_integrity_rq(struct request *rq)`
`166`	`166`	`return 0;`
`167`	`167`	`}`
`168`	`168`
`169`		`-static inline struct bio_vec rq_integrity_vec(struct request rq)`
	`169`	`+static inline struct bio_vec rq_integrity_vec(struct request *rq)`
`170`	`170`	`{`
`171`	`171`	`/* the optimizer will remove all calls to this function */`
`172`	`172`	`return (struct bio_vec){ };`