From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org
Cc: Ira Weiny <ira.weiny@intel.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
"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>,
linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 3/5] fs/xfs: Separate functionality of xfs_inode_supports_dax()
Date: Sun, 20 Oct 2019 08:59:33 -0700 [thread overview]
Message-ID: <20191020155935.12297-4-ira.weiny@intel.com> (raw)
In-Reply-To: <20191020155935.12297-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. Leave that to other helper functions.
Change the caller of xfs_inode_supports_dax() to call
xfs_inode_use_dax() which reflects new logic to override the effective
DAX flag with either the mount option or the physical DAX flag.
To make the logic clear create 2 helper functions for the mount and
physical flag.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
fs/xfs/xfs_iops.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index fe285d123d69..9e5c79aa1b54 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1206,6 +1206,15 @@ static const struct inode_operations xfs_inline_symlink_inode_operations = {
.update_time = xfs_vn_update_time,
};
+static bool
+xfs_inode_mount_is_dax(
+ struct xfs_inode *ip)
+{
+ struct xfs_mount *mp = ip->i_mount;
+
+ return (mp->m_flags & XFS_MOUNT_DAX) == XFS_MOUNT_DAX;
+}
+
/* Figure out if this file actually supports DAX. */
static bool
xfs_inode_supports_dax(
@@ -1217,11 +1226,6 @@ xfs_inode_supports_dax(
if (!S_ISREG(VFS_I(ip)->i_mode) || xfs_is_reflink_inode(ip))
return false;
- /* DAX mount option or DAX iflag must be set. */
- if (!(mp->m_flags & XFS_MOUNT_DAX) &&
- !(ip->i_d.di_flags2 & XFS_DIFLAG2_DAX))
- return false;
-
/* Block size must match page size */
if (mp->m_sb.sb_blocksize != PAGE_SIZE)
return false;
@@ -1230,6 +1234,22 @@ xfs_inode_supports_dax(
return xfs_find_daxdev_for_inode(VFS_I(ip)) != NULL;
}
+static bool
+xfs_inode_is_dax(
+ struct xfs_inode *ip)
+{
+ return (ip->i_d.di_flags2 & XFS_DIFLAG2_DAX) == XFS_DIFLAG2_DAX;
+}
+
+static bool
+xfs_inode_use_dax(
+ struct xfs_inode *ip)
+{
+ return xfs_inode_supports_dax(ip) &&
+ (xfs_inode_mount_is_dax(ip) ||
+ xfs_inode_is_dax(ip));
+}
+
STATIC void
xfs_diflags_to_iflags(
struct inode *inode,
@@ -1248,7 +1268,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_use_dax(ip))
inode->i_flags |= S_DAX;
}
--
2.20.1
next prev parent reply other threads:[~2019-10-20 16:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-20 15:59 [PATCH 0/5] Enable per-file/directory DAX operations ira.weiny
2019-10-20 15:59 ` [PATCH 1/5] fs/stat: Define DAX statx attribute ira.weiny
2019-10-22 11:32 ` Boaz Harrosh
2019-10-22 16:51 ` Ira Weiny
2019-10-20 15:59 ` [PATCH 2/5] fs/xfs: Isolate the physical DAX flag from effective ira.weiny
2019-10-21 0:26 ` Dave Chinner
2019-10-21 17:40 ` Ira Weiny
2019-10-20 15:59 ` ira.weiny [this message]
2019-10-20 15:59 ` [PATCH 4/5] fs/xfs: Clean up DAX support check ira.weiny
2019-10-20 15:59 ` [PATCH 5/5] fs/xfs: Allow toggle of physical DAX flag ira.weiny
2019-10-21 0:45 ` Dave Chinner
2019-10-21 22:49 ` Ira Weiny
2019-10-21 23:46 ` Dave Chinner
2019-11-08 13:12 ` Jan Kara
2019-11-08 13:46 ` Jan Kara
2019-11-08 19:36 ` Ira Weiny
2019-11-11 16:07 ` Jan Kara
2019-11-11 23:54 ` Ira Weiny
2019-10-22 11:21 ` [PATCH 0/5] Enable per-file/directory DAX operations Boaz Harrosh
2019-10-23 13:09 ` Boaz Harrosh
2019-10-23 22:13 ` Dave Chinner
2019-10-24 2:31 ` Boaz Harrosh
2019-10-24 7:34 ` Dave Chinner
2019-10-24 14:05 ` Boaz Harrosh
2019-10-24 21:35 ` Dave Chinner
2019-10-24 23:29 ` Boaz Harrosh
2019-10-25 0:36 ` Dave Chinner
2019-10-25 1:15 ` Boaz Harrosh
2019-10-25 20:49 ` Ira Weiny
2019-10-27 22:10 ` Dave Chinner
2019-10-31 16:17 ` Ira Weiny
2019-11-01 22:47 ` Dave Chinner
2019-11-02 4:25 ` Dan Williams
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=20191020155935.12297-4-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=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).