diff options
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b06517b7f97f..32be3c8f3a11 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2164,12 +2164,12 @@ page_not_uptodate: | |||
2164 | } | 2164 | } |
2165 | EXPORT_SYMBOL(filemap_fault); | 2165 | EXPORT_SYMBOL(filemap_fault); |
2166 | 2166 | ||
2167 | void filemap_map_pages(struct fault_env *fe, | 2167 | void filemap_map_pages(struct vm_fault *vmf, |
2168 | pgoff_t start_pgoff, pgoff_t end_pgoff) | 2168 | pgoff_t start_pgoff, pgoff_t end_pgoff) |
2169 | { | 2169 | { |
2170 | struct radix_tree_iter iter; | 2170 | struct radix_tree_iter iter; |
2171 | void **slot; | 2171 | void **slot; |
2172 | struct file *file = fe->vma->vm_file; | 2172 | struct file *file = vmf->vma->vm_file; |
2173 | struct address_space *mapping = file->f_mapping; | 2173 | struct address_space *mapping = file->f_mapping; |
2174 | pgoff_t last_pgoff = start_pgoff; | 2174 | pgoff_t last_pgoff = start_pgoff; |
2175 | loff_t size; | 2175 | loff_t size; |
@@ -2225,11 +2225,11 @@ repeat: | |||
2225 | if (file->f_ra.mmap_miss > 0) | 2225 | if (file->f_ra.mmap_miss > 0) |
2226 | file->f_ra.mmap_miss--; | 2226 | file->f_ra.mmap_miss--; |
2227 | 2227 | ||
2228 | fe->address += (iter.index - last_pgoff) << PAGE_SHIFT; | 2228 | vmf->address += (iter.index - last_pgoff) << PAGE_SHIFT; |
2229 | if (fe->pte) | 2229 | if (vmf->pte) |
2230 | fe->pte += iter.index - last_pgoff; | 2230 | vmf->pte += iter.index - last_pgoff; |
2231 | last_pgoff = iter.index; | 2231 | last_pgoff = iter.index; |
2232 | if (alloc_set_pte(fe, NULL, page)) | 2232 | if (alloc_set_pte(vmf, NULL, page)) |
2233 | goto unlock; | 2233 | goto unlock; |
2234 | unlock_page(page); | 2234 | unlock_page(page); |
2235 | goto next; | 2235 | goto next; |
@@ -2239,7 +2239,7 @@ skip: | |||
2239 | put_page(page); | 2239 | put_page(page); |
2240 | next: | 2240 | next: |
2241 | /* Huge page is mapped? No need to proceed. */ | 2241 | /* Huge page is mapped? No need to proceed. */ |
2242 | if (pmd_trans_huge(*fe->pmd)) | 2242 | if (pmd_trans_huge(*vmf->pmd)) |
2243 | break; | 2243 | break; |
2244 | if (iter.index == end_pgoff) | 2244 | if (iter.index == end_pgoff) |
2245 | break; | 2245 | break; |