From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Ira Weiny <ira.weiny@intel.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 V7 5/9] fs/xfs: Create function xfs_inode_enable_dax()
Date: Sun, 12 Apr 2020 22:40:42 -0700 [thread overview]
Message-ID: <20200413054046.1560106-6-ira.weiny@intel.com> (raw)
In-Reply-To: <20200413054046.1560106-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 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 | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 81f2f93caec0..37bd15b55878 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1244,12 +1244,11 @@ 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))
+ if (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))
+ /* Only supported on regular files. */
+ if (!S_ISREG(VFS_I(ip)->i_mode))
return false;
/* Block size must match page size */
@@ -1260,6 +1259,31 @@ xfs_inode_supports_dax(
return xfs_inode_buftarg(ip)->bt_daxdev != NULL;
}
+#ifdef CONFIG_FS_DAX
+static bool
+xfs_inode_enable_dax(
+ struct xfs_inode *ip)
+{
+ if (ip->i_mount->m_flags & XFS_MOUNT_NODAX)
+ return false;
+ if (!xfs_inode_supports_dax(ip))
+ return false;
+ if (ip->i_mount->m_flags & XFS_MOUNT_DAX)
+ return true;
+ if (ip->i_d.di_flags2 & XFS_DIFLAG2_DAX)
+ return true;
+ return false;
+}
+#else /* !CONFIG_FS_DAX */
+static bool
+xfs_inode_enable_dax(
+ struct xfs_inode *ip)
+{
+ return false;
+}
+#endif /* CONFIG_FS_DAX */
+
+
STATIC void
xfs_diflags_to_iflags(
struct inode *inode,
@@ -1278,7 +1302,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-13 5:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 5:40 [PATCH V7 0/9] Enable per-file/per-directory DAX operations V7 ira.weiny
2020-04-13 5:40 ` [PATCH V7 1/9] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-04-13 15:41 ` Darrick J. Wong
2020-04-13 5:40 ` [PATCH V7 2/9] fs: Remove unneeded IS_DAX() check in io_is_direct() ira.weiny
2020-04-14 6:22 ` Christoph Hellwig
2020-04-13 5:40 ` [PATCH V7 3/9] fs/stat: Define DAX statx attribute ira.weiny
2020-04-14 6:23 ` Christoph Hellwig
2020-04-14 20:39 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 4/9] fs/xfs: Make DAX mount option a tri-state ira.weiny
2020-04-13 15:46 ` Darrick J. Wong
2020-04-13 19:28 ` Ira Weiny
2020-04-14 6:24 ` Christoph Hellwig
2020-04-14 6:25 ` Christoph Hellwig
2020-04-14 20:34 ` Ira Weiny
2020-04-13 5:40 ` ira.weiny [this message]
2020-04-13 15:52 ` [PATCH V7 5/9] fs/xfs: Create function xfs_inode_enable_dax() Darrick J. Wong
2020-04-13 19:39 ` Ira Weiny
2020-04-14 6:27 ` Christoph Hellwig
2020-04-14 20:43 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 6/9] fs/xfs: Combine xfs_diflags_to_linux() and xfs_diflags_to_iflags() ira.weiny
2020-04-13 16:01 ` Darrick J. Wong
2020-04-14 4:07 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 7/9] fs: Define I_DONTCACNE in VFS layer ira.weiny
2020-04-13 16:09 ` Darrick J. Wong
2020-04-13 16:13 ` Darrick J. Wong
2020-04-13 19:44 ` Ira Weiny
2020-04-14 15:26 ` Jan Kara
2020-04-14 15:45 ` Ira Weiny
2020-04-14 15:59 ` Jan Kara
2020-04-13 5:40 ` [PATCH V7 8/9] fs/xfs: Change xfs_ioctl_setattr_dax_invalidate() ira.weiny
2020-04-13 16:12 ` Darrick J. Wong
2020-04-13 19:46 ` Ira Weiny
2020-04-13 5:40 ` [PATCH V7 9/9] Documentation/dax: Update Usage section ira.weiny
2020-04-13 16:19 ` Darrick J. Wong
2020-04-14 4:38 ` Ira Weiny
2020-04-14 5:12 ` Dan Williams
2020-04-14 19:48 ` Ira Weiny
2020-04-15 8:23 ` Jan Kara
2020-04-14 5:21 ` Dan Williams
2020-04-14 16:15 ` Darrick J. Wong
2020-04-14 19:04 ` Dan Williams
2020-04-14 19:57 ` Darrick J. Wong
2020-04-14 20:00 ` Ira Weiny
2020-04-14 20:18 ` Darrick J. Wong
2020-04-14 20:54 ` Ira Weiny
2020-04-14 21:02 ` Darrick J. Wong
2020-04-14 19:58 ` 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=20200413054046.1560106-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).