mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch removed from -mm tree
The patch titled
Subject: mm/readahead: pass a file_ra_state into force_page_cache_ra
has been removed from the -mm tree. Its filename was
mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Howells <[email protected]>
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.
---
mm/internal.h | 5 +++-- mm/readahead.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra +3 -2
@@ -51,12 +51,13 @@ void unmap_page_range(struct mmu_gathervoid 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);
mm/readahead.c renamed from mm/readahead.c~mm-readahead-pass-a-file_ra_state-into-force_page_cache_ra +2 -3
@@ -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 ; }
_
Patches currently in -mm which might be from [email protected] are
mutex-subsystem-synchro-test-module.patch