From: Greg Kroah-Hartman Date: Wed, 23 Apr 2025 13:55:30 +0000 (+0200) Subject: 6.12-stable patches X-Git-Tag: v6.1.135~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48b086245d78b25716f4299cb0dc530a5088bc6c;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: block-make-struct-rq_list-available-for-config_block.patch --- diff --git a/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch b/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch new file mode 100644 index 0000000000..64d81806ad --- /dev/null +++ b/queue-6.12/block-make-struct-rq_list-available-for-config_block.patch @@ -0,0 +1,38 @@ +From 957860cbc1dc89f79f2acc193470224e350dfd03 Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Fri, 15 Nov 2024 07:14:03 -0700 +Subject: block: make struct rq_list available for !CONFIG_BLOCK + +From: Jens Axboe + +commit 957860cbc1dc89f79f2acc193470224e350dfd03 upstream. + +A previous commit changed how requests are linked in the plug structure, +but unlike the previous method, it uses a new type for it rather than +struct request. The latter is available even for !CONFIG_BLOCK, while +struct rq_list is now. Move it outside CONFIG_BLOCK. + +Reported-by: Nathan Chancellor +Fixes: a3396b99990d ("block: add a rq_list type") +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/blkdev.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h +@@ -995,12 +995,12 @@ extern void blk_put_queue(struct request + + void blk_mark_disk_dead(struct gendisk *disk); + +-#ifdef CONFIG_BLOCK + struct rq_list { + struct request *head; + struct request *tail; + }; + ++#ifdef CONFIG_BLOCK + /* + * blk_plug permits building a queue of related requests by holding the I/O + * fragments for a short period. This allows merging of sequential requests diff --git a/queue-6.12/series b/queue-6.12/series index 65edf685cd..c249b1be1d 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -220,3 +220,4 @@ selftests-bpf-freplace-tests-for-tracking-of-changes_packet_data.patch selftests-bpf-validate-that-tail-call-invalidates-packet-pointers.patch bpf-fix-null-dereference-when-computing-changes_pkt_data-of-prog-w-o-subprogs.patch selftests-bpf-extend-changes_pkt_data-with-cases-w-o-subprograms.patch +block-make-struct-rq_list-available-for-config_block.patch