From: Jens Axboe Date: Mon, 31 Aug 2020 17:20:02 +0000 (-0600) Subject: block: ensure bdi->io_pages is always initialized X-Git-Tag: v5.8.8~34 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a7a42c1e5023cdac2bbc1038689509595d279cd2;p=thirdparty%2Fkernel%2Fstable.git block: ensure bdi->io_pages is always initialized commit de1b0ee490eafdf65fac9eef9925391a8369f2dc upstream. If a driver leaves the limit settings as the defaults, then we don't initialize bdi->io_pages. This means that file systems may need to work around bdi->io_pages == 0, which is somewhat messy. Initialize the default value just like we do for ->ra_pages. Cc: stable@vger.kernel.org Fixes: 9491ae4aade6 ("mm: don't cap request size based on read-ahead setting") Reported-by: OGAWA Hirofumi Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- diff --git a/block/blk-core.c b/block/blk-core.c index 03252af8c82c8..619a3dcd3f5e7 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -526,6 +526,7 @@ struct request_queue *__blk_alloc_queue(int node_id) goto fail_stats; q->backing_dev_info->ra_pages = VM_READAHEAD_PAGES; + q->backing_dev_info->io_pages = VM_READAHEAD_PAGES; q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK; q->node = node_id;