From b1647dc0deef6e923e30c46f28bf5679125c9a10 Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 15 Oct 2020 20:06:35 -0700 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. Signed-off-by: David Howells Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton Cc: Eric Biggers Link: https://lkml.kernel.org/r/20200903140844.14194-10-willy@infradead.org Signed-off-by: Linus Torvalds --- mm/internal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mm/internal.h') diff --git a/mm/internal.h b/mm/internal.h index 03654797a3a9..6345b08ce86c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -51,12 +51,13 @@ void unmap_page_range(struct mmu_gather *tlb, 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); -- cgit v1.2.3