From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org
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>, Jan Kara <jack@suse.cz>,
Jeff Moyer <jmoyer@redhat.com>,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH V6 5/8] fs/xfs: Create function xfs_inode_enable_dax()
Date: Tue, 7 Apr 2020 11:29:55 -0700 [thread overview]
Message-ID: <20200407182958.568475-6-ira.weiny@intel.com> (raw)
In-Reply-To: <20200407182958.568475-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_enable_dax() which reflects if the inode
should be enabled for DAX.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
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 | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 1ec4a36917bd..e07f7b641226 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1237,19 +1237,18 @@ static const struct inode_operations xfs_inline_symlink_inode_operations = {
};
/* Figure out if this file actually supports DAX. */
-static bool
+STATIC bool
xfs_inode_supports_dax(
struct xfs_inode *ip)
{
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))
+ if (xfs_is_reflink_inode(ip))
return false;
- /* DAX mount option or DAX iflag must be set. */
- if (xfs_mount_dax_mode(mp) != XFS_DAX_ALWAYS &&
- !(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
+ /* Only supported on regular files. */
+ if (!S_ISREG(VFS_I(ip)->i_mode))
return false;
/* Block size must match page size */
@@ -1260,6 +1259,19 @@ xfs_inode_supports_dax(
return xfs_inode_buftarg(ip)->bt_daxdev != NULL;
}
+STATIC bool
+xfs_inode_enable_dax(
+ struct xfs_inode *ip)
+{
+ u32 dax_mode = xfs_mount_dax_mode(ip->i_mount);
+
+ if (dax_mode == XFS_DAX_NEVER || !xfs_inode_supports_dax(ip))
+ return false;
+ if (dax_mode == XFS_DAX_ALWAYS || ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)
+ return true;
+ return false;
+}
+
STATIC void
xfs_diflags_to_iflags(
struct inode *inode,
@@ -1278,7 +1290,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_enable_dax(ip))
inode->i_flags |= S_DAX;
}
--
2.25.1
next prev parent reply other threads:[~2020-04-07 18:30 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 18:29 [PATCH V6 0/8] Enable per-file/per-directory DAX operations V6 ira.weiny
2020-04-07 18:29 ` [PATCH V6 1/8] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-04-07 23:46 ` Dave Chinner
2020-04-07 18:29 ` [PATCH V6 2/8] fs: Remove unneeded IS_DAX() check ira.weiny
2020-04-09 7:31 ` Christoph Hellwig
2020-04-09 14:57 ` Ira Weiny
2020-04-07 18:29 ` [PATCH V6 3/8] fs/stat: Define DAX statx attribute ira.weiny
2020-04-07 23:47 ` Dave Chinner
2020-04-07 18:29 ` [PATCH V6 4/8] fs/xfs: Make DAX mount option a tri-state ira.weiny
2020-04-07 23:59 ` Dave Chinner
2020-04-08 0:09 ` Ira Weiny
2020-04-08 0:48 ` Dave Chinner
2020-04-09 15:03 ` Ira Weiny
2020-04-07 18:29 ` ira.weiny [this message]
2020-04-08 0:05 ` [PATCH V6 5/8] fs/xfs: Create function xfs_inode_enable_dax() Dave Chinner
2020-04-08 0:13 ` Ira Weiny
2020-04-07 18:29 ` [PATCH V6 6/8] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags() ira.weiny
2020-04-08 2:08 ` Dave Chinner
2020-04-08 17:09 ` Ira Weiny
2020-04-08 21:02 ` Dave Chinner
2020-04-08 21:28 ` Dan Williams
2020-04-08 22:10 ` Ira Weiny
2020-04-08 23:58 ` Dave Chinner
2020-04-09 0:22 ` Ira Weiny
2020-04-09 12:41 ` Christoph Hellwig
2020-04-09 20:49 ` Ira Weiny
2020-04-08 22:07 ` Ira Weiny
2020-04-08 23:21 ` Dave Chinner
2020-04-09 0:12 ` Ira Weiny
2020-04-09 0:30 ` Darrick J. Wong
2020-04-09 15:29 ` Ira Weiny
2020-04-09 16:59 ` Darrick J. Wong
2020-04-09 17:17 ` Jan Kara
2020-04-09 20:54 ` Ira Weiny
2020-04-09 0:49 ` Dave Chinner
2020-04-09 12:40 ` Christoph Hellwig
2020-04-10 0:27 ` Dave Chinner
2020-04-07 18:29 ` [PATCH V6 7/8] fs/xfs: Change xfs_ioctl_setattr_dax_invalidate() to xfs_ioctl_dax_check() ira.weiny
2020-04-08 2:23 ` Dave Chinner
2020-04-08 9:58 ` Jan Kara
2020-04-08 21:09 ` Dave Chinner
2020-04-08 22:26 ` Ira Weiny
2020-04-08 23:48 ` Dave Chinner
2020-04-09 12:28 ` Christoph Hellwig
2020-04-08 15:37 ` Darrick J. Wong
2020-04-08 18:13 ` Ira Weiny
2020-04-16 5:39 ` [fs/xfs] 857c9841f8: xfstests.xfs.046.fail kernel test robot
2020-04-07 18:29 ` [PATCH V6 8/8] Documentation/dax: Update Usage section 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=20200407182958.568475-6-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).