From: Jens Axboe Date: Fri, 15 Nov 2024 14:14:03 +0000 (-0700) Subject: block: make struct rq_list available for !CONFIG_BLOCK X-Git-Tag: v6.12.25~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78507c1ef2c735a92869af7f41d67edb36b58a5;p=thirdparty%2Fkernel%2Fstable.git block: make struct rq_list available for !CONFIG_BLOCK 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 --- diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 402a7d7fe98db..b94dc4b796f5a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -995,12 +995,12 @@ extern void blk_put_queue(struct request_queue *); 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