mm/readahead: make page_cache_ra_unbounded take a readahead_control

[linux-2.6-microblaze.git] / fs / ext4 / verity.c

diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c
index bbd5e7e..5b7ba8f 100644 (file)
--- a/fs/ext4/verity.c
+++ b/fs/ext4/verity.c
@@ -349,6 +349,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);
        struct page *page;
 
        index += ext4_verity_metadata_pos(inode) >> PAGE_SHIFT;
@@ -358,8 +359,7 @@ static struct page *ext4_read_merkle_tree_page(struct inode *inode,
                if (page)
                        put_page(page);
                else if (num_ra_pages > 1)
-                       page_cache_readahead_unbounded(inode->i_mapping, NULL,
-                                       index, num_ra_pages, 0);
+                       page_cache_ra_unbounded(&ractl, num_ra_pages, 0);
                page = read_mapping_page(inode->i_mapping, index, NULL);
        }
        return page;