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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 80C74C433E9 for ; Thu, 3 Sep 2020 14:09:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2FBA220578 for ; Thu, 3 Sep 2020 14:09:09 +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="QJX4Yh/n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FBA220578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6777B6B0072; Thu, 3 Sep 2020 10:08:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6025D6B0074; Thu, 3 Sep 2020 10:08:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 395D86B0073; Thu, 3 Sep 2020 10:08:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0040.hostedemail.com [216.40.44.40]) by kanga.kvack.org (Postfix) with ESMTP id 007978E0003 for ; Thu, 3 Sep 2020 10:08:57 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B77C8181AEF07 for ; Thu, 3 Sep 2020 14:08:57 +0000 (UTC) X-FDA: 77221931514.10.toes40_4c153e5270aa Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 7468B16A0AE for ; Thu, 3 Sep 2020 14:08:57 +0000 (UTC) X-HE-Tag: toes40_4c153e5270aa X-Filterd-Recvd-Size: 3997 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf05.hostedemail.com (Postfix) with ESMTP for ; Thu, 3 Sep 2020 14:08:56 +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=6to6D0YT64TBlG0mLnZScY0d5oSLUY3YOnbLcSVTPls=; b=QJX4Yh/nIpmVUyVHYgSPW1NBPO M5J0KSRtn3/DYLMCJlY5od8RK/8M/vKtRmDxP4FFdgVsnTdM497OPHMWB4XGkXqzx/k9qdQcIu0uZ JGRTLhvrKX7oAPg0E0CmKWhxaeNYAlS4W60xgo46+6Unfor9+rNDQcgSoM4bjbSw9PeyQU9iDbG9c bjPtp2XaeFFLg25c1bNTxxHpkGh/B9nmdcIkfMsSVV9Vo7rwjAwIxvOOq5f4ds/KUZErWLkTWtmlk vg+4ZX5HV2mfKYU0en04m9loHtygbfqbIhjKkc51PTUqzDVDawGDWEISXwJeeVWRE2Ugwc8ubmOeE CyP8/rXA==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDpv3-0003ip-Fv; Thu, 03 Sep 2020 14:08:53 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: David Howells , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Eric Biggers , Matthew Wilcox Subject: [PATCH 9/9] mm/readahead: Pass a file_ra_state into force_page_cache_ra Date: Thu, 3 Sep 2020 15:08:44 +0100 Message-Id: <20200903140844.14194-10-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200903140844.14194-1-willy@infradead.org> References: <20200903140844.14194-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7468B16A0AE X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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: From: David Howells 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= . Signed-off-by: David Howells Signed-off-by: Matthew Wilcox (Oracle) --- mm/internal.h | 5 +++-- mm/readahead.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 0a2e5caea2aa..ab4beb7c5cd2 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -51,12 +51,13 @@ void unmap_page_range(struct mmu_gather *tlb, =20 void do_page_cache_ra(struct readahead_control *, unsigned long nr_to_re= ad, 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_stat= e *, + unsigned long nr); static inline void force_page_cache_readahead(struct address_space *mapp= ing, 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); } =20 /** diff --git a/mm/readahead.c b/mm/readahead.c index 620ac83f35cc..c6ffb76827da 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -272,11 +272,10 @@ void do_page_cache_ra(struct readahead_control *rac= tl, * 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 =3D ractl->mapping; struct backing_dev_info *bdi =3D inode_to_bdi(mapping->host); - struct file_ra_state *ra =3D &ractl->file->f_ra; unsigned long max_pages, index; =20 if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages && @@ -562,7 +561,7 @@ void page_cache_sync_ra(struct readahead_control *rac= tl, =20 /* 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; } =20 --=20 2.28.0