aboutsummaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 0876cc57255f..4fd9e3f0f48a 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1322,9 +1322,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
1322 struct page *page; 1322 struct page *page;
1323 unsigned long size; 1323 unsigned long size;
1324 int did_readaround = 0; 1324 int did_readaround = 0;
1325 int ret; 1325 int ret = 0;
1326
1327 ret = VM_FAULT_MINOR;
1328 1326
1329 size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; 1327 size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
1330 if (vmf->pgoff >= size) 1328 if (vmf->pgoff >= size)
@@ -1408,7 +1406,7 @@ retry_find:
1408 */ 1406 */
1409 mark_page_accessed(page); 1407 mark_page_accessed(page);
1410 vmf->page = page; 1408 vmf->page = page;
1411 return ret | FAULT_RET_LOCKED; 1409 return ret | VM_FAULT_LOCKED;
1412 1410
1413outside_data_content: 1411outside_data_content:
1414 /* 1412 /*