Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751398AbdILGqQ (ORCPT ); Tue, 12 Sep 2017 02:46:16 -0400 Received: from mx2.suse.de ([195.135.220.15]:49456 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751036AbdILGqO (ORCPT ); Tue, 12 Sep 2017 02:46:14 -0400 Date: Tue, 12 Sep 2017 08:46:12 +0200 From: Jan Kara To: Ross Zwisler Cc: "Theodore Ts'o" , Jan Kara , linux-kernel@vger.kernel.org, Andreas Dilger , Christoph Hellwig , Dan Williams , Dave Chinner , linux-ext4@vger.kernel.org, linux-nvdimm@lists.01.org Subject: Re: [PATCH v2 4/5] ext4: add ext4_should_use_dax() Message-ID: <20170912064612.GD16554@quack2.suse.cz> References: <20170912050526.7627-1-ross.zwisler@linux.intel.com> <20170912050526.7627-5-ross.zwisler@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170912050526.7627-5-ross.zwisler@linux.intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1745 Lines: 59 On Mon 11-09-17 23:05:25, Ross Zwisler wrote: > This helper, in the spirit of ext4_should_dioread_nolock() et al., replaces > the complex conditional in ext4_set_inode_flags(). > > Signed-off-by: Ross Zwisler Yeah, makes sense to me. You can add: Reviewed-by: Jan Kara Honza > --- > fs/ext4/inode.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 3207333..525dd63 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -4577,6 +4577,21 @@ int ext4_get_inode_loc(struct inode *inode, struct ext4_iloc *iloc) > !ext4_test_inode_state(inode, EXT4_STATE_XATTR)); > } > > +static bool ext4_should_use_dax(struct inode *inode) > +{ > + if (!test_opt(inode->i_sb, DAX)) > + return false; > + if (!S_ISREG(inode->i_mode)) > + return false; > + if (ext4_should_journal_data(inode)) > + return false; > + if (ext4_has_inline_data(inode)) > + return false; > + if (ext4_encrypted_inode(inode)) > + return false; > + return true; > +} > + > void ext4_set_inode_flags(struct inode *inode) > { > unsigned int flags = EXT4_I(inode)->i_flags; > @@ -4592,9 +4607,7 @@ void ext4_set_inode_flags(struct inode *inode) > new_fl |= S_NOATIME; > if (flags & EXT4_DIRSYNC_FL) > new_fl |= S_DIRSYNC; > - if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode) && > - !ext4_should_journal_data(inode) && !ext4_has_inline_data(inode) && > - !ext4_encrypted_inode(inode)) > + if (ext4_should_use_dax(inode)) > new_fl |= S_DAX; > inode_set_flags(inode, new_fl, > S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX); > -- > 2.9.5 > -- Jan Kara SUSE Labs, CR