diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 07f5b77114a3..5631d6b2a62d 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -877,8 +877,8 @@ void do_generic_mapping_read(struct address_space *mapping, | |||
877 | cached_page = NULL; | 877 | cached_page = NULL; |
878 | index = *ppos >> PAGE_CACHE_SHIFT; | 878 | index = *ppos >> PAGE_CACHE_SHIFT; |
879 | next_index = index; | 879 | next_index = index; |
880 | prev_index = ra.prev_page; | 880 | prev_index = ra.prev_index; |
881 | prev_offset = ra.offset; | 881 | prev_offset = ra.prev_offset; |
882 | last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; | 882 | last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; |
883 | offset = *ppos & ~PAGE_CACHE_MASK; | 883 | offset = *ppos & ~PAGE_CACHE_MASK; |
884 | 884 | ||
@@ -947,7 +947,8 @@ page_ok: | |||
947 | offset += ret; | 947 | offset += ret; |
948 | index += offset >> PAGE_CACHE_SHIFT; | 948 | index += offset >> PAGE_CACHE_SHIFT; |
949 | offset &= ~PAGE_CACHE_MASK; | 949 | offset &= ~PAGE_CACHE_MASK; |
950 | prev_offset = ra.offset = offset; | 950 | prev_offset = offset; |
951 | ra.prev_offset = offset; | ||
951 | 952 | ||
952 | page_cache_release(page); | 953 | page_cache_release(page); |
953 | if (ret == nr && desc->count) | 954 | if (ret == nr && desc->count) |