diff options
author | Jan Kara <jack@suse.cz> | 2017-11-01 11:36:34 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-03 09:26:23 -0400 |
commit | a0987ad5c576626fdb40547f5ac99b4f90608dda (patch) | |
tree | 21e2e9a3bfad8765a98f37af5d0ecb09ef428930 /fs/dax.c | |
parent | 5e161e4066d3ebeaff95a4b979b42f8bf00494d5 (diff) |
dax: Create local variable for VMA in dax_iomap_pte_fault()
There are already two users and more are coming.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/dax.c')
-rw-r--r-- | fs/dax.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1108,7 +1108,8 @@ static int dax_fault_return(int error) | |||
1108 | static int dax_iomap_pte_fault(struct vm_fault *vmf, | 1108 | static int dax_iomap_pte_fault(struct vm_fault *vmf, |
1109 | const struct iomap_ops *ops) | 1109 | const struct iomap_ops *ops) |
1110 | { | 1110 | { |
1111 | struct address_space *mapping = vmf->vma->vm_file->f_mapping; | 1111 | struct vm_area_struct *vma = vmf->vma; |
1112 | struct address_space *mapping = vma->vm_file->f_mapping; | ||
1112 | struct inode *inode = mapping->host; | 1113 | struct inode *inode = mapping->host; |
1113 | unsigned long vaddr = vmf->address; | 1114 | unsigned long vaddr = vmf->address; |
1114 | loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT; | 1115 | loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT; |
@@ -1196,7 +1197,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf, | |||
1196 | case IOMAP_MAPPED: | 1197 | case IOMAP_MAPPED: |
1197 | if (iomap.flags & IOMAP_F_NEW) { | 1198 | if (iomap.flags & IOMAP_F_NEW) { |
1198 | count_vm_event(PGMAJFAULT); | 1199 | count_vm_event(PGMAJFAULT); |
1199 | count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT); | 1200 | count_memcg_event_mm(vma->vm_mm, PGMAJFAULT); |
1200 | major = VM_FAULT_MAJOR; | 1201 | major = VM_FAULT_MAJOR; |
1201 | } | 1202 | } |
1202 | error = dax_insert_mapping(vmf, &iomap, pos, entry); | 1203 | error = dax_insert_mapping(vmf, &iomap, pos, entry); |