Merge tag 'xfs-for-linus-3.17-rc1' of git://oss.sgi.com/xfs/xfs

[cascardo/linux.git] / mm / readahead.c

diff --git a/mm/readahead.c b/mm/readahead.c
index 0ca36a7..17b9172 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -326,7 +326,6 @@ static unsigned long get_next_ra_size(struct file_ra_state *ra,
  *     - thrashing threshold in memory tight systems
  */
 static pgoff_t count_history_pages(struct address_space *mapping,
-                                  struct file_ra_state *ra,
                                   pgoff_t offset, unsigned long max)
 {
        pgoff_t head;
@@ -349,7 +348,7 @@ static int try_context_readahead(struct address_space *mapping,
 {
        pgoff_t size;
 
-       size = count_history_pages(mapping, ra, offset, max);
+       size = count_history_pages(mapping, offset, max);
 
        /*
         * not enough history pages: