readahead: combine file_ra_state.prev_index/prev_offset into prev_pos

Combine the file_ra_state members
				unsigned long prev_index
				unsigned int prev_offset
into
				loff_t prev_pos

It is more consistent and better supports huge files.

Thanks to Peter for the nice proposal!

[akpm@linux-foundation.org: fix shift overflow]
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index c00723a99f44..c2c3491b18cf 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -143,7 +143,7 @@ static int ext3_readdir(struct file * filp,
                                         sb->s_bdev->bd_inode->i_mapping,
                                         &filp->f_ra, filp,
                                         index, 1);
-                        filp->f_ra.prev_index = index;
+                        filp->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
                         bh = ext3_bread(NULL, inode, blk, 0, &err);
                 }
 
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 3ab01c04e00c..e11890acfa21 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -142,7 +142,7 @@ static int ext4_readdir(struct file * filp,
                                         sb->s_bdev->bd_inode->i_mapping,
                                         &filp->f_ra, filp,
                                         index, 1);
-                        filp->f_ra.prev_index = index;
+                        filp->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
                         bh = ext4_bread(NULL, inode, blk, 0, &err);
                 }
 
diff --git a/fs/splice.c b/fs/splice.c
index e95a36228863..2df6be43c667 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -447,7 +447,7 @@ fill_it:
          */
         while (page_nr < nr_pages)
                 page_cache_release(pages[page_nr++]);
-        in->f_ra.prev_index = index;
+        in->f_ra.prev_pos = (loff_t)index << PAGE_CACHE_SHIFT;
 
         if (spd.nr_pages)
                 return splice_to_pipe(pipe, &spd);