From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org, Jan Kara <jack@suse.cz>
Cc: Ira Weiny <ira.weiny@intel.com>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
Jeff Moyer <jmoyer@redhat.com>,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH RFC 6/8] fs/ext4: Update ext4_should_use_dax()
Date: Mon, 13 Apr 2020 21:00:28 -0700 [thread overview]
Message-ID: <20200414040030.1802884-7-ira.weiny@intel.com> (raw)
In-Reply-To: <20200414040030.1802884-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Change the logic of ext4_should_use_dax() to support using the inode dax
flag OR the overriding tri-state mount option.
While we are at it change the function to ext4_enable_dax() as this
better reflects the ask.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
fs/ext4/inode.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index fa0ff78dc033..e9d582e516bc 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4383,9 +4383,11 @@ 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)
+static bool ext4_enable_dax(struct inode *inode)
{
- if (!test_opt(inode->i_sb, DAX))
+ unsigned int flags = EXT4_I(inode)->i_flags;
+
+ if (test_opt2(inode->i_sb, NODAX))
return false;
if (!S_ISREG(inode->i_mode))
return false;
@@ -4397,7 +4399,13 @@ static bool ext4_should_use_dax(struct inode *inode)
return false;
if (ext4_test_inode_flag(inode, EXT4_INODE_VERITY))
return false;
- return true;
+ if (!bdev_dax_supported(inode->i_sb->s_bdev,
+ inode->i_sb->s_blocksize))
+ return false;
+ if (test_opt(inode->i_sb, DAX))
+ return true;
+
+ return (flags & EXT4_DAX_FL) == EXT4_DAX_FL;
}
void ext4_set_inode_flags(struct inode *inode)
@@ -4415,7 +4423,7 @@ void ext4_set_inode_flags(struct inode *inode)
new_fl |= S_NOATIME;
if (flags & EXT4_DIRSYNC_FL)
new_fl |= S_DIRSYNC;
- if (ext4_should_use_dax(inode))
+ if (ext4_enable_dax(inode))
new_fl |= S_DAX;
if (flags & EXT4_ENCRYPT_FL)
new_fl |= S_ENCRYPTED;
--
2.25.1
next prev parent reply other threads:[~2020-04-14 4:01 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 4:00 [PATCH RFC 0/8] Enable ext4 support for per-file/directory DAX operations ira.weiny
2020-04-14 4:00 ` [PATCH RFC 1/8] fs/ext4: Narrow scope of DAX check in setflags ira.weiny
2020-04-15 11:45 ` Jan Kara
2020-04-14 4:00 ` [PATCH RFC 2/8] fs/ext4: Disallow verity if inode is DAX ira.weiny
2020-04-15 11:58 ` Jan Kara
2020-04-15 12:00 ` Jan Kara
2020-04-15 15:55 ` Theodore Y. Ts'o
2020-04-15 19:21 ` Ira Weiny
2020-04-15 19:14 ` Ira Weiny
2020-04-16 1:29 ` Eric Biggers
2020-04-16 3:48 ` Ira Weiny
2020-04-15 20:34 ` Ira Weiny
2020-04-14 4:00 ` [PATCH RFC 3/8] fs/ext4: Disallow encryption " ira.weiny
2020-04-15 12:02 ` Jan Kara
2020-04-15 20:35 ` Ira Weiny
2020-04-15 16:03 ` Theodore Y. Ts'o
2020-04-15 17:27 ` Dan Williams
2020-04-15 19:54 ` Ira Weiny
2020-04-21 18:41 ` Ira Weiny
2020-04-21 18:56 ` Darrick J. Wong
2020-04-14 4:00 ` [PATCH RFC 4/8] fs/ext4: Introduce DAX inode flag ira.weiny
2020-04-15 12:08 ` Jan Kara
2020-04-15 20:39 ` Ira Weiny
2020-04-16 10:32 ` Jan Kara
2020-04-16 18:01 ` Theodore Y. Ts'o
2020-04-16 16:25 ` Darrick J. Wong
2020-04-16 22:33 ` Ira Weiny
2020-04-16 22:49 ` Darrick J. Wong
2020-04-17 0:37 ` Ira Weiny
2020-04-17 1:57 ` Darrick J. Wong
2020-04-17 2:20 ` Ira Weiny
2020-04-17 6:43 ` Andreas Dilger
2020-04-17 17:19 ` Ira Weiny
2020-04-14 4:00 ` [PATCH RFC 5/8] fs/ext4: Make DAX mount option a tri-state ira.weiny
2020-04-15 12:51 ` Jan Kara
2020-04-14 4:00 ` ira.weiny [this message]
2020-04-15 13:58 ` [PATCH RFC 6/8] fs/ext4: Update ext4_should_use_dax() Jan Kara
2020-04-17 17:16 ` Ira Weiny
2020-04-14 4:00 ` [PATCH RFC 7/8] fs/ext4: Only change S_DAX on inode load ira.weiny
2020-04-15 14:03 ` Jan Kara
2020-04-17 17:18 ` Ira Weiny
2020-04-14 4:00 ` [PATCH RFC 8/8] Documentation/dax: Update DAX enablement for ext4 ira.weiny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200414040030.1802884-7-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=jmoyer@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).