From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11277C433E8 for ; Wed, 22 Jul 2020 06:26:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C3B12207DD for ; Wed, 22 Jul 2020 06:26:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="qcA0OhQS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3B12207DD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6E5FD8D0003; Wed, 22 Jul 2020 02:26:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6960F8D0001; Wed, 22 Jul 2020 02:26:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AB128D0003; Wed, 22 Jul 2020 02:26:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0091.hostedemail.com [216.40.44.91]) by kanga.kvack.org (Postfix) with ESMTP id 42EFD8D0001 for ; Wed, 22 Jul 2020 02:26:36 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F3E291019BA7F for ; Wed, 22 Jul 2020 06:26:35 +0000 (UTC) X-FDA: 77064727992.20.night40_460a1c826f33 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id C7B29180C3D02 for ; Wed, 22 Jul 2020 06:26:35 +0000 (UTC) X-HE-Tag: night40_460a1c826f33 X-Filterd-Recvd-Size: 7180 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP for ; Wed, 22 Jul 2020 06:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=23lPPnUQ/wtgDdZgYVTv/WJAfGlLRFk69cLmomK1pnE=; b=qcA0OhQS+tvPJpXNLSmTGDPyc5 keU4ouYq4cSDEogGD8k4bUBKfBabDc6ohHUdaiZ9l05VOph7dpcwQ+awDYWN9Vi/VYLPfYxRwy37Y bSj9zsc72LYO58T3vbwX9cZ+fZVr6Z8YbU35YOqOtpWbLWYMh41yBRu5MOFCUWH1N6dKKBZWoC/Mh kQKisQ2fhXZReZ9HZpoLQ8LfzBSGhVT5FIYBsk51xdkI4WHXfTJgrusohPbWknqb2l4c9+pt2mdXM qlmorndIPcM9UgyeGf45vU9ZbwucMrFP6dnzXlqDkUKqL9TGUiISg2JVHpfmda3Kga9JikUFtspcB AOF6Zn2w==; Received: from [2001:4bb8:18c:2acc:e75:d48f:65ef:e944] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jy8Cr-0004mF-Ol; Wed, 22 Jul 2020 06:26:25 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Song Liu , Hans de Goede , Richard Weinberger , Minchan Kim , linux-mtd@lists.infradead.org, dm-devel@redhat.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org Subject: [PATCH 04/14] bdi: initialize ->ra_pages in bdi_init Date: Wed, 22 Jul 2020 08:25:42 +0200 Message-Id: <20200722062552.212200-5-hch@lst.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200722062552.212200-1-hch@lst.de> References: <20200722062552.212200-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: C7B29180C3D02 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Set up a readahead size by default, as very few users have a good reason to change it. Signed-off-by: Christoph Hellwig --- block/blk-core.c | 1 - drivers/mtd/mtdcore.c | 1 + fs/9p/vfs_super.c | 4 ++-- fs/afs/super.c | 1 - fs/btrfs/disk-io.c | 1 - fs/fuse/inode.c | 1 - fs/nfs/super.c | 9 +-------- fs/ubifs/super.c | 1 + fs/vboxsf/super.c | 1 + mm/backing-dev.c | 1 + 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 93104c7470e8ac..ea1665de7a2079 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -538,7 +538,6 @@ struct request_queue *blk_alloc_queue(int node_id) if (!q->stats) goto fail_stats; =20 - q->backing_dev_info->ra_pages =3D VM_READAHEAD_PAGES; q->backing_dev_info->capabilities =3D BDI_CAP_CGROUP_WRITEBACK; q->node =3D node_id; =20 diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 7d930569a7dfb7..01b3fe888d885b 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -2196,6 +2196,7 @@ static struct backing_dev_info * __init mtd_bdi_ini= t(char *name) bdi =3D bdi_alloc(NUMA_NO_NODE); if (!bdi) return ERR_PTR(-ENOMEM); + bdi->ra_pages =3D 0; =20 /* * We put '-0' suffix to the name to get the same name format as we diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c index 74df32be4c6a52..a338eb979cadf9 100644 --- a/fs/9p/vfs_super.c +++ b/fs/9p/vfs_super.c @@ -80,8 +80,8 @@ v9fs_fill_super(struct super_block *sb, struct v9fs_ses= sion_info *v9ses, if (ret) return ret; =20 - if (v9ses->cache) - sb->s_bdi->ra_pages =3D VM_READAHEAD_PAGES; + if (!v9ses->cache) + sb->s_bdi->ra_pages =3D 0; =20 sb->s_flags |=3D SB_ACTIVE | SB_DIRSYNC; if (!v9ses->cache) diff --git a/fs/afs/super.c b/fs/afs/super.c index b552357b1d1379..3a40ee752c1e3f 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c @@ -456,7 +456,6 @@ static int afs_fill_super(struct super_block *sb, str= uct afs_fs_context *ctx) ret =3D super_setup_bdi(sb); if (ret) return ret; - sb->s_bdi->ra_pages =3D VM_READAHEAD_PAGES; =20 /* allocate the root inode and dentry */ if (as->dyn_root) { diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ad157b55d7f5f0..f92c45fe019c48 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3033,7 +3033,6 @@ int __cold open_ctree(struct super_block *sb, struc= t btrfs_fs_devices *fs_device } =20 sb->s_bdi->capabilities |=3D BDI_CAP_CGROUP_WRITEBACK; - sb->s_bdi->ra_pages =3D VM_READAHEAD_PAGES; sb->s_bdi->ra_pages *=3D btrfs_super_num_devices(disk_super); sb->s_bdi->ra_pages =3D max(sb->s_bdi->ra_pages, SZ_4M / PAGE_SIZE); =20 diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index bba747520e9b08..17b00670fb539e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1049,7 +1049,6 @@ static int fuse_bdi_init(struct fuse_conn *fc, stru= ct super_block *sb) if (err) return err; =20 - sb->s_bdi->ra_pages =3D VM_READAHEAD_PAGES; /* fuse does it's own writeback accounting */ sb->s_bdi->capabilities =3D BDI_CAP_NO_ACCT_WB | BDI_CAP_STRICTLIMIT; =20 diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 7a70287f21a2c1..f943e37853fa25 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1200,13 +1200,6 @@ static void nfs_get_cache_cookie(struct super_bloc= k *sb, } #endif =20 -static void nfs_set_readahead(struct backing_dev_info *bdi, - unsigned long iomax_pages) -{ - bdi->ra_pages =3D VM_READAHEAD_PAGES; - bdi->io_pages =3D iomax_pages; -} - int nfs_get_tree_common(struct fs_context *fc) { struct nfs_fs_context *ctx =3D nfs_fc2context(fc); @@ -1251,7 +1244,7 @@ int nfs_get_tree_common(struct fs_context *fc) MINOR(server->s_dev)); if (error) goto error_splat_super; - nfs_set_readahead(s->s_bdi, server->rpages); + s->s_bdi->io_pages =3D server->rpages; server->super =3D s; } =20 diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 7fc2f3f07c16ed..ee7692e7a35371 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -2159,6 +2159,7 @@ static int ubifs_fill_super(struct super_block *sb,= void *data, int silent) c->vi.vol_id); if (err) goto out_close; + sb->s_bdi->ra_pages =3D 0; /* ubifs does its own readahead */ =20 sb->s_fs_info =3D c; sb->s_magic =3D UBIFS_SUPER_MAGIC; diff --git a/fs/vboxsf/super.c b/fs/vboxsf/super.c index 8fe03b4a0d2b03..6574ae5a97c2c8 100644 --- a/fs/vboxsf/super.c +++ b/fs/vboxsf/super.c @@ -167,6 +167,7 @@ static int vboxsf_fill_super(struct super_block *sb, = struct fs_context *fc) err =3D super_setup_bdi_name(sb, "vboxsf-%d", sbi->bdi_id); if (err) goto fail_free; + sb->s_bdi->ra_pages =3D 0; =20 /* Turn source into a shfl_string and map the folder */ size =3D strlen(fc->source) + 1; diff --git a/mm/backing-dev.c b/mm/backing-dev.c index 8e8b00627bb2d8..3e441e0ff1bc88 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -746,6 +746,7 @@ struct backing_dev_info *bdi_alloc(int node_id) kfree(bdi); return NULL; } + bdi->ra_pages =3D VM_READAHEAD_PAGES; return bdi; } EXPORT_SYMBOL(bdi_alloc); --=20 2.27.0