Merge branch 'acpica'

[linux-2.6-microblaze.git] / fs / reiserfs / inode.c

diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 6419e6d..0031070 100644 (file)
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -1160,11 +1160,9 @@ failure:
        return retval;
 }
 
-static int
-reiserfs_readpages(struct file *file, struct address_space *mapping,
-                  struct list_head *pages, unsigned nr_pages)
+static void reiserfs_readahead(struct readahead_control *rac)
 {
-       return mpage_readpages(mapping, pages, nr_pages, reiserfs_get_block);
+       mpage_readahead(rac, reiserfs_get_block);
 }
 
 /*
@@ -3434,7 +3432,7 @@ out:
 const struct address_space_operations reiserfs_address_space_operations = {
        .writepage = reiserfs_writepage,
        .readpage = reiserfs_readpage,
-       .readpages = reiserfs_readpages,
+       .readahead = reiserfs_readahead,
        .releasepage = reiserfs_releasepage,
        .invalidatepage = reiserfs_invalidatepage,
        .write_begin = reiserfs_write_begin,