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=-6.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 C975CC433DF for ; Fri, 16 Oct 2020 02:43:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4FAF2208C7 for ; Fri, 16 Oct 2020 02:43:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="opIVTOC5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FAF2208C7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D31FD940013; Thu, 15 Oct 2020 22:43:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CBAFB940007; Thu, 15 Oct 2020 22:43:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAD9C940013; Thu, 15 Oct 2020 22:43:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0161.hostedemail.com [216.40.44.161]) by kanga.kvack.org (Postfix) with ESMTP id 8B2C4940007 for ; Thu, 15 Oct 2020 22:43:21 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 20A51181AEF00 for ; Fri, 16 Oct 2020 02:43:21 +0000 (UTC) X-FDA: 77376242202.01.linen73_20134ec27219 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id F19301004933F for ; Fri, 16 Oct 2020 02:43:20 +0000 (UTC) X-HE-Tag: linen73_20134ec27219 X-Filterd-Recvd-Size: 3923 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Fri, 16 Oct 2020 02:43:20 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4298B2087D; Fri, 16 Oct 2020 02:43:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602816199; bh=pSLe2EuBluH2YyJnqXQeN/6NP+42ZTBfr9BcxV+VQhE=; h=Date:From:To:Subject:In-Reply-To:From; b=opIVTOC5iK/bI1E11Zz/4OaiIZ4yn8FYpS0cmm9EBbzEHdl5NpyX7X0ATA3Se8MCc OZXEhrg2eZhilXLv6vAGblKC77vCBeqy+ntvoa7L2EVXNeT4F4f+vuxLAH9N4X3yBo RgCnbDYA85UKTZB0ZDHrAnTYxPpihlX3vG4i/Kr0= Date: Thu, 15 Oct 2020 19:43:18 -0700 From: Andrew Morton To: akpm@linux-foundation.org, dhowells@redhat.com, ebiggers@google.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, willy@infradead.org Subject: [patch 040/156] mm/readahead: pass a file_ra_state into force_page_cache_ra Message-ID: <20201016024318.8_mUu8fi_%akpm@linux-foundation.org> In-Reply-To: <20201015192732.f448da14e9854c7cb7299956@linux-foundation.org> User-Agent: s-nail v14.8.16 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: From: David Howells Subject: mm/readahead: pass a file_ra_state into force_page_cache_ra The file_ra_state being passed into page_cache_sync_readahead() was being ignored in favour of using the one embedded in the struct file. The only caller for which this makes a difference is the fsverity code if the file has been marked as POSIX_FADV_RANDOM, but it's confusing and worth fixing. Link: https://lkml.kernel.org/r/20200903140844.14194-10-willy@infradead.org Signed-off-by: David Howells Signed-off-by: Matthew Wilcox (Oracle) Cc: Eric Biggers Signed-off-by: Andrew Morton --- mm/internal.h | 5 +++-- mm/readahead.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/mm/internal.h~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra +++ a/mm/internal.h @@ -51,12 +51,13 @@ void unmap_page_range(struct mmu_gather void do_page_cache_ra(struct readahead_control *, unsigned long nr_to_read, unsigned long lookahead_size); -void force_page_cache_ra(struct readahead_control *, unsigned long nr); +void force_page_cache_ra(struct readahead_control *, struct file_ra_state *, + unsigned long nr); static inline void force_page_cache_readahead(struct address_space *mapping, struct file *file, pgoff_t index, unsigned long nr_to_read) { DEFINE_READAHEAD(ractl, file, mapping, index); - force_page_cache_ra(&ractl, nr_to_read); + force_page_cache_ra(&ractl, &file->f_ra, nr_to_read); } struct page *find_get_entry(struct address_space *mapping, pgoff_t index); --- a/mm/readahead.c~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra +++ a/mm/readahead.c @@ -272,11 +272,10 @@ void do_page_cache_ra(struct readahead_c * memory at once. */ void force_page_cache_ra(struct readahead_control *ractl, - unsigned long nr_to_read) + struct file_ra_state *ra, unsigned long nr_to_read) { struct address_space *mapping = ractl->mapping; struct backing_dev_info *bdi = inode_to_bdi(mapping->host); - struct file_ra_state *ra = &ractl->file->f_ra; unsigned long max_pages, index; if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages && @@ -562,7 +561,7 @@ void page_cache_sync_ra(struct readahead /* be dumb */ if (ractl->file && (ractl->file->f_mode & FMODE_RANDOM)) { - force_page_cache_ra(ractl, req_count); + force_page_cache_ra(ractl, ra, req_count); return; } _