diff options
| author |   Matthew Wilcox (Oracle) <willy@infradead.org> | 2021-04-07 21:18:55 +0100 |
|---|---|---|
| committer |   David Howells <dhowells@redhat.com> | 2021-04-23 09:25:00 +0100 |
| commit | fcd9ae4f7f3b5fbd549285bab0478a339113620e (patch) | |
| tree | 4a188d6754431b22be1913cf13841ca4d808bc87 /fs/ext4 | |
| parent | mm: Add set/end/wait functions for PG_private_2 (diff) | |
| download | linux-dev-fcd9ae4f7f3b5fbd549285bab0478a339113620e.tar.xz linux-dev-fcd9ae4f7f3b5fbd549285bab0478a339113620e.zip | |
mm/filemap: Pass the file_ra_state in the ractl
For readahead_expand(), we need to modify the file ra_state, so pass it
down by adding it to the ractl. We have to do this because it's not always
the same as f_ra in the struct file that is already being passed.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Jeff Layton <jlayton@kernel.org>
Tested-by: Dave Wysochanski <dwysocha@redhat.com>
Tested-By: Marc Dionne <marc.dionne@auristor.com>
Link: https://lore.kernel.org/r/20210407201857.3582797-2-willy@infradead.org/
Link: https://lore.kernel.org/r/161789067431.6155.8063840447229665720.stgit@warthog.procyon.org.uk/ # v6
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/verity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index 00e3cbde472e..07438f46b558 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c @@ -370,7 +370,7 @@ static struct page *ext4_read_merkle_tree_page(struct inode *inode, pgoff_t index, unsigned long num_ra_pages) { - DEFINE_READAHEAD(ractl, NULL, inode->i_mapping, index); + DEFINE_READAHEAD(ractl, NULL, NULL, inode->i_mapping, index); struct page *page; index += ext4_verity_metadata_pos(inode) >> PAGE_SHIFT; |