readahead: code cleanup

[mirror_ubuntu-zesty-kernel.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 07f5b77114a3bb4678b5c245d0159367b487e51e..5631d6b2a62d8c18c43472dd5bf4eae3f5e88d10 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -877,8 +877,8 @@ void do_generic_mapping_read(struct address_space *mapping,
        cached_page = NULL;
        index = *ppos >> PAGE_CACHE_SHIFT;
        next_index = index;
-       prev_index = ra.prev_page;
-       prev_offset = ra.offset;
+       prev_index = ra.prev_index;
+       prev_offset = ra.prev_offset;
        last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
        offset = *ppos & ~PAGE_CACHE_MASK;
 
@@ -947,7 +947,8 @@ page_ok:
                offset += ret;
                index += offset >> PAGE_CACHE_SHIFT;
                offset &= ~PAGE_CACHE_MASK;
-               prev_offset = ra.offset = offset;
+               prev_offset = offset;
+               ra.prev_offset = offset;
 
                page_cache_release(page);
                if (ret == nr && desc->count)