Merge branch 'for-6.11/block' into for-next

axboe · axboe · commit 9c6e1f8702d5 · 2024-06-26T19:02:47.000-06:00
* for-6.11/block:
  block: use the right type for stub rq_integrity_vec()
diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h
@@ -145,7 +145,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
`@@ -145,7 +145,7 @@ static inline int blk_integrity_rq(struct request *rq)`
`145`	`145`	`return 0;`
`146`	`146`	`}`
`147`	`147`
`148`		`-static inline struct bio_vec rq_integrity_vec(struct request rq)`
	`148`	`+static inline struct bio_vec rq_integrity_vec(struct request *rq)`
`149`	`149`	`{`
`150`	`150`	`/* the optimizer will remove all calls to this function */`
`151`	`151`	`return (struct bio_vec){ };`