From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Ira Weiny <ira.weiny@intel.com>,
Al Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>,
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-fsdevel@vger.kernel.org
Subject: [PATCH V9 06/11] fs/xfs: Create function xfs_inode_should_enable_dax()
Date: Tue, 21 Apr 2020 12:17:48 -0700 [thread overview]
Message-ID: <20200421191754.3372370-7-ira.weiny@intel.com> (raw)
In-Reply-To: <20200421191754.3372370-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
xfs_inode_supports_dax() should reflect if the inode can support DAX not
that it is enabled for DAX.
Change the use of xfs_inode_supports_dax() to reflect only if the inode
and underlying storage support dax.
Add a new function xfs_inode_should_enable_dax() which reflects if the
inode should be enabled for DAX.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V8
Change to 'should enable' (feedback given by Jan in ext4 series)
Darrick I've preserved your Reviewed-by for now LMK if
that is an issue.
Changes from v7:
Move S_ISREG check first
use IS_ENABLED(CONFIG_FS_DAX) rather than duplicated function
Changes from v6:
Change enable checks to be sequential logic.
Update for 2 bit tri-state option.
Make 'static' consistent.
Don't set S_DAX if !CONFIG_FS_DAX
Changes from v5:
Update to reflect the new tri-state mount option
Changes from v3:
Update functions and names to be more clear
Update commit message
Merge with
'fs/xfs: Clean up DAX support check'
don't allow IS_DAX() on a directory
use STATIC macro for static
make xfs_inode_supports_dax() static
---
fs/xfs/xfs_iops.c | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 462f89af479a..1814f10e43d3 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1243,13 +1243,12 @@ xfs_inode_supports_dax(
{
struct xfs_mount *mp = ip->i_mount;
- /* Only supported on non-reflinked files. */
- if (!S_ISREG(VFS_I(ip)->i_mode) || xfs_is_reflink_inode(ip))
+ /* Only supported on regular files. */
+ if (!S_ISREG(VFS_I(ip)->i_mode))
return false;
- /* DAX mount option or DAX iflag must be set. */
- if (!(mp->m_flags & XFS_MOUNT_DAX_ALWAYS) &&
- !(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
+ /* Only supported on non-reflinked files. */
+ if (xfs_is_reflink_inode(ip))
return false;
/* Block size must match page size */
@@ -1260,6 +1259,23 @@ xfs_inode_supports_dax(
return xfs_inode_buftarg(ip)->bt_daxdev != NULL;
}
+static bool
+xfs_inode_should_enable_dax(
+ struct xfs_inode *ip)
+{
+ if (!IS_ENABLED(CONFIG_FS_DAX))
+ return false;
+ if (ip->i_mount->m_flags & XFS_MOUNT_DAX_NEVER)
+ return false;
+ if (!xfs_inode_supports_dax(ip))
+ return false;
+ if (ip->i_mount->m_flags & XFS_MOUNT_DAX_ALWAYS)
+ return true;
+ if (ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)
+ return true;
+ return false;
+}
+
STATIC void
xfs_diflags_to_iflags(
struct inode *inode,
@@ -1278,7 +1294,7 @@ xfs_diflags_to_iflags(
inode->i_flags |= S_SYNC;
if (flags & XFS_DIFLAG_NOATIME)
inode->i_flags |= S_NOATIME;
- if (xfs_inode_supports_dax(ip))
+ if (xfs_inode_should_enable_dax(ip))
inode->i_flags |= S_DAX;
}
--
2.25.1
next prev parent reply other threads:[~2020-04-21 19:18 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 19:17 [PATCH V9 00/11] XFS - Enable per-file/per-directory DAX operations V9 ira.weiny
2020-04-21 19:17 ` [PATCH V9 01/11] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-04-21 19:17 ` [PATCH V9 02/11] fs: Remove unneeded IS_DAX() check in io_is_direct() ira.weiny
2020-04-21 20:13 ` Darrick J. Wong
2020-04-22 8:37 ` Jan Kara
2020-04-21 19:17 ` [PATCH V9 03/11] fs/stat: Define DAX statx attribute ira.weiny
2020-04-22 16:29 ` Darrick J. Wong
2020-04-22 18:51 ` Ira Weiny
2020-04-23 8:24 ` Jan Kara
2020-04-21 19:17 ` [PATCH V9 04/11] fs/xfs: Change XFS_MOUNT_DAX to XFS_MOUNT_DAX_ALWAYS ira.weiny
2020-04-21 19:17 ` [PATCH V9 05/11] fs/xfs: Make DAX mount option a tri-state ira.weiny
2020-04-21 20:16 ` Darrick J. Wong
2020-04-21 21:06 ` Ira Weiny
2020-04-21 19:17 ` ira.weiny [this message]
2020-04-21 19:17 ` [PATCH V9 07/11] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags() ira.weiny
2020-04-21 19:17 ` [PATCH V9 08/11] fs: Lift XFS_IDONTCACNE to the VFS layer ira.weiny
2020-04-21 20:23 ` Darrick J. Wong
2020-04-21 21:12 ` Ira Weiny
2020-04-22 8:41 ` Jan Kara
2020-04-21 19:17 ` [PATCH V9 09/11] fs: Introduce DCACHE_DONTCACHE ira.weiny
2020-04-21 20:25 ` Darrick J. Wong
2020-04-21 21:15 ` Ira Weiny
2020-04-22 2:34 ` Al Viro
2020-04-22 3:46 ` Ira Weiny
2020-04-22 8:46 ` Jan Kara
2020-04-22 15:19 ` Ira Weiny
2020-04-21 19:17 ` [PATCH V9 10/11] fs/xfs: Update xfs_ioctl_setattr_dax_invalidate() ira.weiny
2020-04-21 20:31 ` Darrick J. Wong
2020-04-21 21:30 ` Dave Chinner
2020-04-21 21:43 ` Ira Weiny
2020-04-21 23:13 ` Dave Chinner
2020-04-21 23:24 ` Ira Weiny
2020-04-21 19:17 ` [PATCH V9 11/11] Documentation/dax: Update Usage section ira.weiny
2020-04-21 20:34 ` Darrick J. Wong
2020-04-21 21:49 ` Ira Weiny
2020-04-22 9:47 ` Jan Kara
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=20200421191754.3372370-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 \
--cc=viro@zeniv.linux.org.uk \
/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).