Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley
        Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United
        Kingdom.
        Registered in England and Wales under Company Registration No. 3798903
Subject: [RFC PATCH 7/7] mm: Pass a file_ra_state struct into
 force_page_cache_readahead()
From:   David Howells <dhowells@redhat.com>
To:     willy@infradead.org
Cc:     dhowells@redhat.com, linux-fsdevel@vger.kernel.org,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org
Date:   Tue, 01 Sep 2020 17:29:06 +0100
Message-ID: <159897774687.405783.6157146299031279302.stgit@warthog.procyon.org.uk>
In-Reply-To: <159897769535.405783.17587409235571100774.stgit@warthog.procyon.org.uk>
References: <159897769535.405783.17587409235571100774.stgit@warthog.procyon.org.uk>
User-Agent: StGit/0.23
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Pass a file_ra_state struct into force_page_cache_readahead().  One caller
has one that should be passed in and the other doesn't, but the former
needs to pass its in.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 mm/fadvise.c   |    2 +-
 mm/internal.h  |    2 +-
 mm/readahead.c |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mm/fadvise.c b/mm/fadvise.c
index b68d2f2959d5..2f1550279757 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -107,7 +107,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
 		{
 			DEFINE_READAHEAD(rac, file, mapping, start_index);
 			rac._nr_pages = nrpages;
-			force_page_cache_readahead(&rac);
+			force_page_cache_readahead(&rac, &rac.file->f_ra);
 		}
 		break;
 	case POSIX_FADV_NOREUSE:
diff --git a/mm/internal.h b/mm/internal.h
index de3b2ce2743a..977ad7d81b1b 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -49,7 +49,7 @@ void unmap_page_range(struct mmu_gather *tlb,
 			     unsigned long addr, unsigned long end,
 			     struct zap_details *details);
 
-void force_page_cache_readahead(struct readahead_control *);
+void force_page_cache_readahead(struct readahead_control *, struct file_ra_state *);
 void __do_page_cache_readahead(struct readahead_control *, unsigned long);
 
 /**
diff --git a/mm/readahead.c b/mm/readahead.c
index 28ff80304a21..b001720c13aa 100644
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -273,11 +273,11 @@ void __do_page_cache_readahead(struct readahead_control *rac,
  * Chunk the readahead into 2 megabyte units, so that we don't pin too much
  * memory at once.
  */
-void force_page_cache_readahead(struct readahead_control *rac)
+void force_page_cache_readahead(struct readahead_control *rac,
+				struct file_ra_state *ra)
 {
 	struct address_space *mapping = rac->mapping;
 	struct backing_dev_info *bdi = inode_to_bdi(mapping->host);
-	struct file_ra_state *ra = &rac->file->f_ra;
 	unsigned long max_pages, index, nr_to_read;
 
 	if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages &&
@@ -657,7 +657,7 @@ void page_cache_sync_readahead(struct readahead_control *rac,
 
 	/* be dumb */
 	if (rac->file && (rac->file->f_mode & FMODE_RANDOM)) {
-		force_page_cache_readahead(rac);
+		force_page_cache_readahead(rac, ra);
 		return;
 	}