{"id":810301,"url":"http://patchwork.ozlabs.org/api/patches/810301/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170905223541.20594-5-ross.zwisler@linux.intel.com/","project":{"id":8,"url":"http://patchwork.ozlabs.org/api/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":"<20170905223541.20594-5-ross.zwisler@linux.intel.com>","list_archive_url":null,"date":"2017-09-05T22:35:36","name":"[4/9] ext4: add ext4_should_use_dax()","commit_ref":null,"pull_url":null,"state":"new","archived":true,"hash":"636a6e2e7e6282810fc94e153e4da6e83dbad463","submitter":{"id":46514,"url":"http://patchwork.ozlabs.org/api/people/46514/?format=json","name":"Ross Zwisler","email":"ross.zwisler@linux.intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-ext4/patch/20170905223541.20594-5-ross.zwisler@linux.intel.com/mbox/","series":[{"id":1660,"url":"http://patchwork.ozlabs.org/api/series/1660/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-ext4/list/?series=1660","date":"2017-09-05T22:35:36","name":"add ext4 per-inode DAX flag","version":1,"mbox":"http://patchwork.ozlabs.org/series/1660/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810301/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810301/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 3xn1lr63RHz9sR9\n\tfor ;\n\tWed, 6 Sep 2017 08:36:24 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754032AbdIEWgV (ORCPT );\n\tTue, 5 Sep 2017 18:36:21 -0400","from mga01.intel.com ([192.55.52.88]:31464 \"EHLO mga01.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1753751AbdIEWgT (ORCPT );\n\tTue, 5 Sep 2017 18:36:19 -0400","from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Sep 2017 15:36:16 -0700","from theros.lm.intel.com ([10.232.112.77])\n\tby fmsmga004.fm.intel.com with ESMTP; 05 Sep 2017 15:36:15 -0700"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.41,481,1498546800\"; d=\"scan'208\";a=\"308314875\"","From":"Ross Zwisler ","To":"Andrew Morton , linux-kernel@vger.kernel.org","Cc":"Ross Zwisler ,\n\t\"Darrick J. Wong\" ,\n\t\"Theodore Ts'o\" ,\n\tAndreas Dilger ,\n\tChristoph Hellwig , Dan Williams ,\n\tDave Chinner , Jan Kara ,\n\tlinux-ext4@vger.kernel.org, linux-nvdimm@lists.01.org,\n\tlinux-xfs@vger.kernel.org","Subject":"[PATCH 4/9] ext4: add ext4_should_use_dax()","Date":"Tue, 5 Sep 2017 16:35:36 -0600","Message-Id":"<20170905223541.20594-5-ross.zwisler@linux.intel.com>","X-Mailer":"git-send-email 2.9.5","In-Reply-To":"<20170905223541.20594-1-ross.zwisler@linux.intel.com>","References":"<20170905223541.20594-1-ross.zwisler@linux.intel.com>","Sender":"linux-ext4-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"linux-ext4@vger.kernel.org"},"content":"This helper, in the spirit of ext4_should_dioread_nolock() et al., replaces\nthe complex conditional in ext4_set_inode_flags() and will soon be called\nin multiple places.\n\nSigned-off-by: Ross Zwisler \n---\n fs/ext4/ext4_jbd2.h | 15 +++++++++++++++\n fs/ext4/inode.c | 4 +---\n 2 files changed, 16 insertions(+), 3 deletions(-)","diff":"diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h\nindex 48143e3..65e2aa9 100644\n--- a/fs/ext4/ext4_jbd2.h\n+++ b/fs/ext4/ext4_jbd2.h\n@@ -462,4 +462,19 @@ static inline int ext4_should_dioread_nolock(struct inode *inode)\n \treturn 1;\n }\n \n+static inline bool ext4_should_use_dax(struct inode *inode)\n+{\n+\tif (!test_opt(inode->i_sb, DAX))\n+\t\treturn false;\n+\tif (!S_ISREG(inode->i_mode))\n+\t\treturn false;\n+\tif (ext4_should_journal_data(inode))\n+\t\treturn false;\n+\tif (ext4_has_inline_data(inode))\n+\t\treturn false;\n+\tif (ext4_encrypted_inode(inode))\n+\t\treturn false;\n+\treturn true;\n+}\n+\n #endif\t/* _EXT4_JBD2_H */\ndiff --git a/fs/ext4/inode.c b/fs/ext4/inode.c\nindex c774bdc..864fb94 100644\n--- a/fs/ext4/inode.c\n+++ b/fs/ext4/inode.c\n@@ -4599,9 +4599,7 @@ void ext4_set_inode_flags(struct inode *inode)\n \t\tnew_fl |= S_NOATIME;\n \tif (flags & EXT4_DIRSYNC_FL)\n \t\tnew_fl |= S_DIRSYNC;\n-\tif (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode) &&\n-\t !ext4_should_journal_data(inode) && !ext4_has_inline_data(inode) &&\n-\t !ext4_encrypted_inode(inode))\n+\tif (ext4_should_use_dax(inode))\n \t\tnew_fl |= S_DAX;\n \tinode_set_flags(inode, new_fl,\n \t\t\tS_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX);\n","prefixes":["4/9"]}