Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5420237 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Linus Torvalds
Browse files

mm: refactor readahead defines in mm.h 

All users of VM_MAX_READAHEAD actually convert it to kbytes and then to
pages. Define the macro explicitly as (SZ_128K / PAGE_SIZE). This
simplifies the expression in every filesystem. Also rename the macro to
VM_READAHEAD_PAGES to properly convey its meaning. Finally remove unused
VM_MIN_READAHEAD

[akpm@linux-foundation.org: fix fs/io_uring.c, per Stephen]
Link: http://lkml.kernel.org/r/20181221144053.24318-1-nborisov@suse.com


Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarMatthew Wilcox <willy@infradead.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Eric Van Hensbergen <ericvh@gmail.com>
Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Dominique Martinet <asmadeus@codewreck.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b57e622e

block/blk-core.c

+1 −2
Original line number Diff line number Diff line
@@ -500,8 +500,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) 
	if (!q->stats)

		goto fail_stats;



	q->backing_dev_info->ra_pages =

			(VM_MAX_READAHEAD * 1024) / PAGE_SIZE;

	q->backing_dev_info->ra_pages = VM_READAHEAD_PAGES;

	q->backing_dev_info->capabilities = BDI_CAP_CGROUP_WRITEBACK;

	q->backing_dev_info->name = "block";

	q->node = node_id;

fs/9p/vfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_session_info *v9ses, 
		return ret;



	if (v9ses->cache)

		sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024)/PAGE_SIZE;

		sb->s_bdi->ra_pages = VM_READAHEAD_PAGES;



	sb->s_flags |= SB_ACTIVE | SB_DIRSYNC;

	if (!v9ses->cache)

fs/afs/super.c

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

	if (ret)

		return ret;

	sb->s_bdi->ra_pages	= VM_MAX_READAHEAD * 1024 / PAGE_SIZE;

	sb->s_bdi->ra_pages	= VM_READAHEAD_PAGES;



	/* allocate the root inode and dentry */

	if (as->dyn_root) {

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,7 @@ int open_ctree(struct super_block *sb, 
	sb->s_bdi->congested_fn = btrfs_congested_fn;

	sb->s_bdi->congested_data = fs_info;

	sb->s_bdi->capabilities |= BDI_CAP_CGROUP_WRITEBACK;

	sb->s_bdi->ra_pages = VM_MAX_READAHEAD * SZ_1K / PAGE_SIZE;

	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);

fs/fuse/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static int fuse_bdi_init(struct fuse_conn *fc, struct super_block *sb) 
	if (err)

		return err;



	sb->s_bdi->ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_SIZE;

	sb->s_bdi->ra_pages = VM_READAHEAD_PAGES;

	/* fuse does it's own writeback accounting */

	sb->s_bdi->capabilities = BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT;