{"id":806356,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806356/?format=json","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/1.0/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},"msgid":"<150389212595.25151.10721705529768874001.stgit@dwillia2-desk3.amr.corp.intel.com>","date":"2017-08-28T03:48:46","name":"[v2,2/2] ext2, ext4: use the super_block dax_device","commit_ref":null,"pull_url":null,"state":"new","archived":true,"hash":"49ab760ed50a6e586fb4ef75ccb62e8f400cdd0e","submitter":{"id":347,"url":"http://patchwork.ozlabs.org/api/1.0/people/347/?format=json","name":"Dan Williams","email":"dan.j.williams@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/150389212595.25151.10721705529768874001.stgit@dwillia2-desk3.amr.corp.intel.com/mbox/","series":[{"id":64,"url":"http://patchwork.ozlabs.org/api/1.0/series/64/?format=json","date":"2017-08-28T03:48:35","name":"fs, dax: lookup dax_device at mount time","version":2,"mbox":"http://patchwork.ozlabs.org/series/64/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806356/checks/","tags":{},"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 3xgdFs2NLGz9t2d\n\tfor ;\n\tMon, 28 Aug 2017 13:55:13 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751915AbdH1DzL (ORCPT );\n\tSun, 27 Aug 2017 23:55:11 -0400","from mga05.intel.com ([192.55.52.43]:10923 \"EHLO mga05.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1751768AbdH1DzK (ORCPT );\n\tSun, 27 Aug 2017 23:55:10 -0400","from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga105.fm.intel.com with ESMTP; 27 Aug 2017 20:55:10 -0700","from dwillia2-desk3.jf.intel.com (HELO\n\tdwillia2-desk3.amr.corp.intel.com) ([10.54.39.125])\n\tby fmsmga001.fm.intel.com with ESMTP; 27 Aug 2017 20:55:10 -0700"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.41,439,1498546800\"; d=\"scan'208\";a=\"1188719449\"","Subject":"[PATCH v2 2/2] ext2, ext4: use the super_block dax_device","From":"Dan Williams ","To":"linux-fsdevel@vger.kernel.org","Cc":"Theodore Ts'o , linux-nvdimm@lists.01.org,\n\tlinux-xfs@vger.kernel.org, Andreas Dilger ,\n\tJan Kara , jack@suse.cz,\n\tlinux-ext4@vger.kernel.org, hch@lst.de","Date":"Sun, 27 Aug 2017 20:48:46 -0700","Message-ID":"<150389212595.25151.10721705529768874001.stgit@dwillia2-desk3.amr.corp.intel.com>","In-Reply-To":"<150389211501.25151.6477753201827914462.stgit@dwillia2-desk3.amr.corp.intel.com>","References":"<150389211501.25151.6477753201827914462.stgit@dwillia2-desk3.amr.corp.intel.com>","User-Agent":"StGit/0.17.1-9-g687f","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Sender":"linux-ext4-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"The ->iomap_begin() operation is a hot path, and now that mount_bdev()\narranges for the dax_device to be populated in the super_block, we can\njust reference that attribute directly rather than perform a new lookup.\n\nCc: Jan Kara \nCc: \"Theodore Ts'o\" \nCc: Andreas Dilger \nReported-by: Christoph Hellwig \nSigned-off-by: Dan Williams \n---\n fs/ext2/inode.c | 10 ++--------\n fs/ext4/inode.c | 10 ++--------\n 2 files changed, 4 insertions(+), 16 deletions(-)","diff":"diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c\nindex 30163d007b2f..7102b77a83c6 100644\n--- a/fs/ext2/inode.c\n+++ b/fs/ext2/inode.c\n@@ -800,7 +800,6 @@ int ext2_get_block(struct inode *inode, sector_t iblock,\n static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,\n \t\tunsigned flags, struct iomap *iomap)\n {\n-\tstruct block_device *bdev;\n \tunsigned int blkbits = inode->i_blkbits;\n \tunsigned long first_block = offset >> blkbits;\n \tunsigned long max_blocks = (length + (1 << blkbits) - 1) >> blkbits;\n@@ -814,13 +813,9 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,\n \t\treturn ret;\n \n \tiomap->flags = 0;\n-\tbdev = inode->i_sb->s_bdev;\n-\tiomap->bdev = bdev;\n+\tiomap->bdev = inode->i_sb->s_bdev;\n \tiomap->offset = (u64)first_block << blkbits;\n-\tif (blk_queue_dax(bdev->bd_queue))\n-\t\tiomap->dax_dev = fs_dax_get_by_host(bdev->bd_disk->disk_name);\n-\telse\n-\t\tiomap->dax_dev = NULL;\n+\tiomap->dax_dev = inode->i_sb->s_daxdev;\n \n \tif (ret == 0) {\n \t\tiomap->type = IOMAP_HOLE;\n@@ -842,7 +837,6 @@ static int\n ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length,\n \t\tssize_t written, unsigned flags, struct iomap *iomap)\n {\n-\tfs_put_dax(iomap->dax_dev);\n \tif (iomap->type == IOMAP_MAPPED &&\n \t written < length &&\n \t (flags & IOMAP_WRITE))\ndiff --git a/fs/ext4/inode.c b/fs/ext4/inode.c\nindex c774bdc22759..311690522366 100644\n--- a/fs/ext4/inode.c\n+++ b/fs/ext4/inode.c\n@@ -3404,7 +3404,6 @@ static int ext4_releasepage(struct page *page, gfp_t wait)\n static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,\n \t\t\t unsigned flags, struct iomap *iomap)\n {\n-\tstruct block_device *bdev;\n \tunsigned int blkbits = inode->i_blkbits;\n \tunsigned long first_block = offset >> blkbits;\n \tunsigned long last_block = (offset + length - 1) >> blkbits;\n@@ -3473,12 +3472,8 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,\n \t}\n \n \tiomap->flags = 0;\n-\tbdev = inode->i_sb->s_bdev;\n-\tiomap->bdev = bdev;\n-\tif (blk_queue_dax(bdev->bd_queue))\n-\t\tiomap->dax_dev = fs_dax_get_by_host(bdev->bd_disk->disk_name);\n-\telse\n-\t\tiomap->dax_dev = NULL;\n+\tiomap->bdev = inode->i_sb->s_bdev;\n+\tiomap->dax_dev = inode->i_sb->s_daxdev;\n \tiomap->offset = first_block << blkbits;\n \n \tif (ret == 0) {\n@@ -3511,7 +3506,6 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length,\n \tint blkbits = inode->i_blkbits;\n \tbool truncate = false;\n \n-\tfs_put_dax(iomap->dax_dev);\n \tif (!(flags & IOMAP_WRITE) || (flags & IOMAP_FAULT))\n \t\treturn 0;\n \n","prefixes":["v2","2/2"]}