]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
dax: Create local variable for VMA in dax_iomap_pte_fault()
authorJan Kara <jack@suse.cz>
Wed, 1 Nov 2017 15:36:34 +0000 (16:36 +0100)
committerDan Williams <dan.j.williams@intel.com>
Fri, 3 Nov 2017 13:26:23 +0000 (06:26 -0700)
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>
fs/dax.c

index 116eef8d6c6915852aa5df30fe9de4cfdcce4d45..c09465884bbe39dde2e27ddc7b48c1e1daed47dd 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1108,7 +1108,8 @@ static int dax_fault_return(int error)
 static int dax_iomap_pte_fault(struct vm_fault *vmf,
                               const struct iomap_ops *ops)
 {
-       struct address_space *mapping = vmf->vma->vm_file->f_mapping;
+       struct vm_area_struct *vma = vmf->vma;
+       struct address_space *mapping = vma->vm_file->f_mapping;
        struct inode *inode = mapping->host;
        unsigned long vaddr = vmf->address;
        loff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT;
@@ -1196,7 +1197,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf,
        case IOMAP_MAPPED:
                if (iomap.flags & IOMAP_F_NEW) {
                        count_vm_event(PGMAJFAULT);
-                       count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT);
+                       count_memcg_event_mm(vma->vm_mm, PGMAJFAULT);
                        major = VM_FAULT_MAJOR;
                }
                error = dax_insert_mapping(vmf, &iomap, pos, entry);