| Message ID | 20170912050526.7627-5-ross.zwisler@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 <ross.zwisler@linux.intel.com> Yeah, makes sense to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> 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 >
On Tue, Sep 12, 2017 at 08:46:12AM +0200, Jan Kara wrote: > 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 <ross.zwisler@linux.intel.com> > > Yeah, makes sense to me. You can add: > > Reviewed-by: Jan Kara <jack@suse.cz> Thanks, applied. - Ted
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);
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 <ross.zwisler@linux.intel.com> --- fs/ext4/inode.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)