commit f4e6b498d6e06742d72706ef50593a9c4dd72214
author Fengguang Wu <wfg@mail.ustc.edu.cn> Tue Oct 16 01:24:33 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Oct 16 09:42:52 2007 -0700
tree 74a573302b2ea086c0d21907175be604f110f5b1
parent 0bb7ba6b9c358c12084a3cbc6ac08c8d1e973937

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>

fs/splice.c

diff --git a/fs/splice.c b/fs/splice.c
index e95a362..2df6be4 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -447,7 +447,7 @@
 	 */
 	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);