6.1-stable patches

added patches:
	block-use-the-right-type-for-stub-rq_integrity_vec.patch

diff --git a/queue-6.1/block-use-the-right-type-for-stub-rq_integrity_vec.patch b/queue-6.1/block-use-the-right-type-for-stub-rq_integrity_vec.patch
new file mode 100644 (file)
index 0000000..9fe721d
--- /dev/null
+++ b/queue-6.1/block-use-the-right-type-for-stub-rq_integrity_vec.patch
@@ -0,0 +1,31 @@
+From 69b6517687a4b1fb250bd8c9c193a0a304c8ba17 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Wed, 26 Jun 2024 19:01:58 -0600
+Subject: block: use the right type for stub rq_integrity_vec()
+
+From: Jens Axboe <axboe@kernel.dk>
+
+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>
+---
+ include/linux/blk-integrity.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/blk-integrity.h
++++ b/include/linux/blk-integrity.h
+@@ -175,7 +175,7 @@ static inline int blk_integrity_rq(struc
+       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){ };

diff --git a/queue-6.1/series b/queue-6.1/series
index 198649dc86d3a06c15547d889eb8532ad065c2b9..7d6a1a4e0355b183463265e2554385c1f1e4e312 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -132,3 +132,4 @@ mptcp-pm-fix-backup-support-in-signal-endpoints.patch
 selftests-mptcp-join-validate-backup-in-mpj.patch
 selftests-mptcp-join-check-backup-support-in-signal-endp.patch
 mptcp-pm-deny-endp-with-signal-subflow-port.patch
+block-use-the-right-type-for-stub-rq_integrity_vec.patch