{"id":829954,"url":"http://patchwork.ozlabs.org/api/1.2/patches/829954/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-6-jack@suse.cz/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/1.2/projects/8/?format=json","name":"Linux ext4 filesystem development","link_name":"linux-ext4","list_id":"linux-ext4.vger.kernel.org","list_email":"linux-ext4@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171024152415.22864-6-jack@suse.cz>","list_archive_url":null,"date":"2017-10-24T15:24:02","name":"[05/17] dax: Create local variable for VMA in dax_iomap_pte_fault()","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"c0744bef249cb404b57bfe514dec50c847bc3da0","submitter":{"id":363,"url":"http://patchwork.ozlabs.org/api/1.2/people/363/?format=json","name":"Jan Kara","email":"jack@suse.cz"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-6-jack@suse.cz/mbox/","series":[{"id":10008,"url":"http://patchwork.ozlabs.org/api/1.2/series/10008/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=10008","date":"2017-10-24T15:23:57","name":"dax, ext4, xfs: Synchronous page faults","version":5,"mbox":"http://patchwork.ozlabs.org/series/10008/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/829954/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/829954/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-ext4-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yLxvf0WZDz9t2c\n\tfor ;\n\tWed, 25 Oct 2017 02:26:54 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932518AbdJXP0r (ORCPT );\n\tTue, 24 Oct 2017 11:26:47 -0400","from mx2.suse.de ([195.135.220.15]:36101 \"EHLO mx2.suse.de\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S932210AbdJXPZb (ORCPT );\n\tTue, 24 Oct 2017 11:25:31 -0400","from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx2.suse.de (Postfix) with ESMTP id 141E3AC95;\n\tTue, 24 Oct 2017 15:25:28 +0000 (UTC)","by quack2.suse.cz (Postfix, from userid 1000)\n\tid 598D71E35C2; Tue, 24 Oct 2017 17:25:27 +0200 (CEST)"],"X-Virus-Scanned":"by amavisd-new at test-mx.suse.de","From":"Jan Kara ","To":"Dan Williams ","Cc":"Ross Zwisler ,\n\tChristoph Hellwig ,\n\t, linux-nvdimm@lists.01.org,\n\t, ,\n\tlinux-api@vger.kernel.org, , Jan Kara ","Subject":"[PATCH 05/17] dax: Create local variable for VMA in\n\tdax_iomap_pte_fault()","Date":"Tue, 24 Oct 2017 17:24:02 +0200","Message-Id":"<20171024152415.22864-6-jack@suse.cz>","X-Mailer":"git-send-email 2.12.3","In-Reply-To":"<20171024152415.22864-1-jack@suse.cz>","References":"<20171024152415.22864-1-jack@suse.cz>","Sender":"linux-ext4-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"There are already two users and more are coming.\n\nReviewed-by: Christoph Hellwig \nReviewed-by: Ross Zwisler \nSigned-off-by: Jan Kara \n---\n fs/dax.c | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)","diff":"diff --git a/fs/dax.c b/fs/dax.c\nindex 116eef8d6c69..c09465884bbe 100644\n--- a/fs/dax.c\n+++ b/fs/dax.c\n@@ -1108,7 +1108,8 @@ static int dax_fault_return(int error)\n static int dax_iomap_pte_fault(struct vm_fault *vmf,\n \t\t\t const struct iomap_ops *ops)\n {\n-\tstruct address_space *mapping = vmf->vma->vm_file->f_mapping;\n+\tstruct vm_area_struct *vma = vmf->vma;\n+\tstruct address_space *mapping = vma->vm_file->f_mapping;\n \tstruct inode *inode = mapping->host;\n \tunsigned long vaddr = vmf->address;\n \tloff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT;\n@@ -1196,7 +1197,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf,\n \tcase IOMAP_MAPPED:\n \t\tif (iomap.flags & IOMAP_F_NEW) {\n \t\t\tcount_vm_event(PGMAJFAULT);\n-\t\t\tcount_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT);\n+\t\t\tcount_memcg_event_mm(vma->vm_mm, PGMAJFAULT);\n \t\t\tmajor = VM_FAULT_MAJOR;\n \t\t}\n \t\terror = dax_insert_mapping(vmf, &iomap, pos, entry);\n","prefixes":["05/17"]}