Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 829955,
    "url": "http://patchwork.ozlabs.org/api/1.2/patches/829955/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-4-jack@suse.cz/",
    "project": {
        "id": 8,
        "url": "http://patchwork.ozlabs.org/api/1.2/projects/8/?format=api",
        "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-4-jack@suse.cz>",
    "list_archive_url": null,
    "date": "2017-10-24T15:24:00",
    "name": "[03/17] dax: Simplify arguments of dax_insert_mapping()",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "eadf42e574e357b7a98c9a78271137b14f95e467",
    "submitter": {
        "id": 363,
        "url": "http://patchwork.ozlabs.org/api/1.2/people/363/?format=api",
        "name": "Jan Kara",
        "email": "jack@suse.cz"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/linux-ext4/patch/20171024152415.22864-4-jack@suse.cz/mbox/",
    "series": [
        {
            "id": 10008,
            "url": "http://patchwork.ozlabs.org/api/1.2/series/10008/?format=api",
            "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/829955/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/829955/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<linux-ext4-owner@vger.kernel.org>",
        "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=<UNKNOWN>)",
        "Received": [
            "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yLxvg52b5z9t2c\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 25 Oct 2017 02:26:55 +1100 (AEDT)",
            "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932314AbdJXPZb (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tTue, 24 Oct 2017 11:25:31 -0400",
            "from mx2.suse.de ([195.135.220.15]:36029 \"EHLO mx2.suse.de\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1750813AbdJXPZ3 (ORCPT <rfc822;linux-ext4@vger.kernel.org>);\n\tTue, 24 Oct 2017 11:25:29 -0400",
            "from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254])\n\tby mx2.suse.de (Postfix) with ESMTP id B97F7ABAF;\n\tTue, 24 Oct 2017 15:25:27 +0000 (UTC)",
            "by quack2.suse.cz (Postfix, from userid 1000)\n\tid 566B61E3471; Tue, 24 Oct 2017 17:25:27 +0200 (CEST)"
        ],
        "X-Virus-Scanned": "by amavisd-new at test-mx.suse.de",
        "From": "Jan Kara <jack@suse.cz>",
        "To": "Dan Williams <dan.j.williams@intel.com>",
        "Cc": "Ross Zwisler <ross.zwisler@linux.intel.com>,\n\tChristoph Hellwig <hch@infradead.org>,\n\t<linux-ext4@vger.kernel.org>, linux-nvdimm@lists.01.org,\n\t<linux-fsdevel@vger.kernel.org>, <linux-xfs@vger.kernel.org>,\n\tlinux-api@vger.kernel.org, <linux-mm@kvack.org>, Jan Kara <jack@suse.cz>",
        "Subject": "[PATCH 03/17] dax: Simplify arguments of dax_insert_mapping()",
        "Date": "Tue, 24 Oct 2017 17:24:00 +0200",
        "Message-Id": "<20171024152415.22864-4-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": "<linux-ext4.vger.kernel.org>",
        "X-Mailing-List": "linux-ext4@vger.kernel.org"
    },
    "content": "dax_insert_mapping() has lots of arguments and a lot of them is actuall\nduplicated by passing vm_fault structure as well. Change the function to\ntake the same arguments as dax_pmd_insert_mapping().\n\nReviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>\nReviewed-by: Christoph Hellwig <hch@lst.de>\nSigned-off-by: Jan Kara <jack@suse.cz>\n---\n fs/dax.c | 32 ++++++++++++++++----------------\n 1 file changed, 16 insertions(+), 16 deletions(-)",
    "diff": "diff --git a/fs/dax.c b/fs/dax.c\nindex f001d8c72a06..0bc42ac294ca 100644\n--- a/fs/dax.c\n+++ b/fs/dax.c\n@@ -820,23 +820,30 @@ int dax_writeback_mapping_range(struct address_space *mapping,\n }\n EXPORT_SYMBOL_GPL(dax_writeback_mapping_range);\n \n-static int dax_insert_mapping(struct address_space *mapping,\n-\t\tstruct block_device *bdev, struct dax_device *dax_dev,\n-\t\tsector_t sector, size_t size, void *entry,\n-\t\tstruct vm_area_struct *vma, struct vm_fault *vmf)\n+static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)\n+{\n+\treturn iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);\n+}\n+\n+static int dax_insert_mapping(struct vm_fault *vmf, struct iomap *iomap,\n+\t\t\t      loff_t pos, void *entry)\n {\n+\tconst sector_t sector = dax_iomap_sector(iomap, pos);\n+\tstruct vm_area_struct *vma = vmf->vma;\n+\tstruct address_space *mapping = vma->vm_file->f_mapping;\n \tunsigned long vaddr = vmf->address;\n \tvoid *ret, *kaddr;\n \tpgoff_t pgoff;\n \tint id, rc;\n \tpfn_t pfn;\n \n-\trc = bdev_dax_pgoff(bdev, sector, size, &pgoff);\n+\trc = bdev_dax_pgoff(iomap->bdev, sector, PAGE_SIZE, &pgoff);\n \tif (rc)\n \t\treturn rc;\n \n \tid = dax_read_lock();\n-\trc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(size), &kaddr, &pfn);\n+\trc = dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(PAGE_SIZE),\n+\t\t\t       &kaddr, &pfn);\n \tif (rc < 0) {\n \t\tdax_read_unlock(id);\n \t\treturn rc;\n@@ -936,11 +943,6 @@ int __dax_zero_page_range(struct block_device *bdev,\n }\n EXPORT_SYMBOL_GPL(__dax_zero_page_range);\n \n-static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)\n-{\n-\treturn iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);\n-}\n-\n static loff_t\n dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,\n \t\tstruct iomap *iomap)\n@@ -1087,7 +1089,6 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf,\n \tstruct inode *inode = mapping->host;\n \tunsigned long vaddr = vmf->address;\n \tloff_t pos = (loff_t)vmf->pgoff << PAGE_SHIFT;\n-\tsector_t sector;\n \tstruct iomap iomap = { 0 };\n \tunsigned flags = IOMAP_FAULT;\n \tint error, major = 0;\n@@ -1140,9 +1141,9 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf,\n \t\tgoto error_finish_iomap;\n \t}\n \n-\tsector = dax_iomap_sector(&iomap, pos);\n-\n \tif (vmf->cow_page) {\n+\t\tsector_t sector = dax_iomap_sector(&iomap, pos);\n+\n \t\tswitch (iomap.type) {\n \t\tcase IOMAP_HOLE:\n \t\tcase IOMAP_UNWRITTEN:\n@@ -1175,8 +1176,7 @@ static int dax_iomap_pte_fault(struct vm_fault *vmf,\n \t\t\tcount_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT);\n \t\t\tmajor = VM_FAULT_MAJOR;\n \t\t}\n-\t\terror = dax_insert_mapping(mapping, iomap.bdev, iomap.dax_dev,\n-\t\t\t\tsector, PAGE_SIZE, entry, vmf->vma, vmf);\n+\t\terror = dax_insert_mapping(vmf, &iomap, pos, entry);\n \t\t/* -EBUSY is fine, somebody else faulted on the same PTE */\n \t\tif (error == -EBUSY)\n \t\t\terror = 0;\n",
    "prefixes": [
        "03/17"
    ]
}