From: Greg Kroah-Hartman Date: Mon, 12 Aug 2024 14:04:54 +0000 (+0200) Subject: 6.10-stable patches X-Git-Tag: v6.1.105~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1800072f172f3c63099bb6f320e89194d0a6759;p=thirdparty%2Fkernel%2Fstable-queue.git 6.10-stable patches added patches: block-use-the-right-type-for-stub-rq_integrity_vec.patch --- diff --git a/queue-6.10/block-use-the-right-type-for-stub-rq_integrity_vec.patch b/queue-6.10/block-use-the-right-type-for-stub-rq_integrity_vec.patch new file mode 100644 index 00000000000..2622b348690 --- /dev/null +++ b/queue-6.10/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 +Date: Wed, 26 Jun 2024 19:01:58 -0600 +Subject: block: use the right type for stub rq_integrity_vec() + +From: Jens Axboe + +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 +Cc: Matthieu Baerts +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -166,7 +166,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.10/series b/queue-6.10/series index 38dee54ae9f..e800e63a9ca 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -247,3 +247,4 @@ drm-mgag200-bind-i2c-lifetime-to-drm-device.patch drm-radeon-remove-__counted_by-from-statearray.states.patch mptcp-fully-established-after-add_addr-echo-on-mpj.patch mptcp-pm-deny-endp-with-signal-subflow-port.patch +block-use-the-right-type-for-stub-rq_integrity_vec.patch