Commit 55b2598e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

bdi: initialize ->ra_pages and ->io_pages in bdi_init 



Set up a readahead size by default, as very few users have a good
reason to change it.  This means code, ecryptfs, and orangefs now
set up the values while they were previously missing it, while ubifs,
mtd and vboxsf manually set it to 0 to avoid readahead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Acked-by: David Sterba <dsterba@suse.com> [btrfs]
Acked-by: Richard Weinberger <richard@nod.at> [ubifs, mtd]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9e82d35b

block/blk-core.c

+0 −2
Original line number Diff line number Diff line
@@ -538,8 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id) 
	if (!q->stats)

		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;

drivers/mtd/mtdcore.c

+2 −0
Original line number Diff line number Diff line
@@ -2196,6 +2196,8 @@ static struct backing_dev_info * __init mtd_bdi_init(char *name) 
	bdi = bdi_alloc(NUMA_NO_NODE);

	if (!bdi)

		return ERR_PTR(-ENOMEM);

	bdi->ra_pages = 0;

	bdi->io_pages = 0;



	/*

	 * We put '-0' suffix to the name to get the same name format as we

fs/9p/vfs_super.c

+4 −2
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, 
	if (ret)

		return ret;



	if (v9ses->cache)

		sb->s_bdi->ra_pages = VM_READAHEAD_PAGES;

	if (!v9ses->cache) {

		sb->s_bdi->ra_pages = 0;

		sb->s_bdi->io_pages = 0;

	}



	sb->s_flags |= SB_ACTIVE | SB_DIRSYNC;

	if (!v9ses->cache)

fs/afs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ static int afs_fill_super(struct super_block *sb, struct afs_fs_context *ctx) 
	ret = super_setup_bdi(sb);

	if (ret)

		return ret;

	sb->s_bdi->ra_pages	= VM_READAHEAD_PAGES;



	/* allocate the root inode and dentry */

	if (as->dyn_root) {

fs/btrfs/disk-io.c

+0 −1
Original line number Diff line number Diff line
@@ -3092,7 +3092,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	}



	sb->s_bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK;

	sb->s_bdi->ra_pages = VM_READAHEAD_PAGES;

	sb->s_bdi->ra_pages *= btrfs_super_num_devices(disk_super);

	sb->s_bdi->ra_pages = max(sb->s_bdi->ra_pages, SZ_4M / PAGE_SIZE);