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: [RFC PATCH V2 12/12] fs/xfs: Allow toggle of effective DAX flag
Date: Fri, 10 Jan 2020 11:29:42 -0800 [thread overview]
Message-ID: <20200110192942.25021-13-ira.weiny@intel.com> (raw)
In-Reply-To: <20200110192942.25021-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
Now that locking of the inode is in place we can allow a mode change
while under the new lock.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
fs/xfs/xfs_inode.h | 1 +
fs/xfs/xfs_ioctl.c | 9 ++++++---
fs/xfs/xfs_iops.c | 15 +++++++++++----
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 693ca66bd89b..b0d2e7da88c6 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -474,6 +474,7 @@ int xfs_break_layouts(struct inode *inode, uint *iolock,
/* from xfs_iops.c */
extern void xfs_setup_inode(struct xfs_inode *ip);
extern void xfs_setup_iops(struct xfs_inode *ip);
+extern void xfs_setup_a_ops(struct xfs_inode *ip);
/*
* When setting up a newly allocated inode, we need to call
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 9a35bf83eaa1..e07559bf70a9 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1109,12 +1109,11 @@ xfs_diflags_to_linux(
inode->i_flags |= S_NOATIME;
else
inode->i_flags &= ~S_NOATIME;
-#if 0 /* disabled until the flag switching races are sorted out */
if (xflags & FS_XFLAG_DAX)
inode->i_flags |= S_DAX;
else
inode->i_flags &= ~S_DAX;
-#endif
+
}
static int
@@ -1191,7 +1190,7 @@ xfs_ioctl_setattr_dax_invalidate(
if (S_ISDIR(inode->i_mode))
return 0;
- flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL;
+ flags = XFS_MMAPLOCK_EXCL | XFS_IOLOCK_EXCL | XFS_DAX_EXCL;
/* lock, flush and invalidate mapping in preparation for flag change */
xfs_ilock(ip, flags);
@@ -1512,6 +1511,8 @@ xfs_ioctl_setattr(
else
ip->i_d.di_cowextsize = 0;
+ xfs_setup_a_ops(ip);
+
code = xfs_trans_commit(tp);
/*
@@ -1621,6 +1622,8 @@ xfs_ioc_setxflags(
goto out_drop_write;
}
+ xfs_setup_a_ops(ip);
+
error = xfs_trans_commit(tp);
out_drop_write:
mnt_drop_write_file(filp);
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index a34b04e8ac9c..c70164a0df97 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1386,6 +1386,16 @@ xfs_setup_inode(
}
}
+void xfs_setup_a_ops(struct xfs_inode *ip)
+{
+ struct inode *inode = &ip->i_vnode;
+
+ if (IS_DAX(inode))
+ inode->i_mapping->a_ops = &xfs_dax_aops;
+ else
+ inode->i_mapping->a_ops = &xfs_address_space_operations;
+}
+
void
xfs_setup_iops(
struct xfs_inode *ip)
@@ -1396,10 +1406,7 @@ xfs_setup_iops(
case S_IFREG:
inode->i_op = &xfs_reg_inode_operations;
inode->i_fop = &xfs_file_operations;
- if (IS_DAX(inode))
- inode->i_mapping->a_ops = &xfs_dax_aops;
- else
- inode->i_mapping->a_ops = &xfs_address_space_operations;
+ xfs_setup_a_ops(ip);
break;
case S_IFDIR:
if (xfs_sb_version_hasasciici(&XFS_M(inode->i_sb)->m_sb))
--
2.21.0
prev parent reply other threads:[~2020-01-10 19:30 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 19:29 [RFC PATCH V2 00/12] Enable per-file/directory DAX operations V2 ira.weiny
2020-01-10 19:29 ` [RFC PATCH V2 01/12] fs/stat: Define DAX statx attribute ira.weiny
2020-01-15 11:37 ` Jan Kara
2020-01-15 17:38 ` Darrick J. Wong
2020-01-15 19:45 ` Ira Weiny
2020-01-15 20:10 ` Dan Williams
2020-01-15 22:38 ` Ira Weiny
2020-01-16 5:39 ` Darrick J. Wong
2020-01-16 6:05 ` Dan Williams
2020-01-16 6:18 ` Darrick J. Wong
2020-01-16 6:25 ` Dan Williams
2020-01-18 9:11 ` Dave Chinner
2020-01-16 17:55 ` Ira Weiny
2020-01-16 18:04 ` Darrick J. Wong
2020-01-16 18:52 ` Ira Weiny
2020-01-16 22:19 ` Darrick J. Wong
2020-01-17 11:58 ` Jan Kara
2020-01-10 19:29 ` [RFC PATCH V2 02/12] fs/xfs: Isolate the physical DAX flag from effective ira.weiny
2020-01-10 19:29 ` [RFC PATCH V2 03/12] fs/xfs: Separate functionality of xfs_inode_supports_dax() ira.weiny
2020-01-10 19:29 ` [RFC PATCH V2 04/12] fs/xfs: Clean up DAX support check ira.weiny
2020-01-10 19:29 ` [RFC PATCH V2 05/12] fs: remove unneeded IS_DAX() check ira.weiny
2020-01-16 9:38 ` Jan Kara
2020-01-16 18:47 ` Ira Weiny
2020-01-10 19:29 ` [RFC PATCH V2 06/12] fs/xfs: Check if the inode supports DAX under lock ira.weiny
2020-01-10 19:29 ` [RFC PATCH V2 07/12] fs: Add locking for a dynamic inode 'mode' ira.weiny
2020-01-13 22:12 ` Darrick J. Wong
2020-01-14 0:20 ` Ira Weiny
2020-01-14 1:03 ` Darrick J. Wong
2020-01-15 19:08 ` Ira Weiny
2020-01-16 5:40 ` Darrick J. Wong
2020-01-16 18:54 ` Ira Weiny
2020-01-10 19:29 ` [RFC PATCH V2 08/12] fs/xfs: Add lock/unlock mode to xfs ira.weiny
2020-01-13 22:19 ` Darrick J. Wong
2020-01-14 0:35 ` Ira Weiny
2020-01-15 0:57 ` Ira Weiny
2020-01-15 23:52 ` Ira Weiny
2020-01-16 9:24 ` Jan Kara
2020-01-16 19:12 ` Ira Weiny
2020-01-10 19:29 ` [RFC PATCH V2 09/12] fs: Prevent mode change if file is mmap'ed ira.weiny
2020-01-13 22:22 ` Darrick J. Wong
2020-01-14 0:46 ` Ira Weiny
2020-01-14 1:30 ` Darrick J. Wong
2020-01-14 17:53 ` Ira Weiny
2020-01-15 11:34 ` Jan Kara
2020-01-15 18:24 ` Ira Weiny
2020-01-15 10:21 ` David Laight
2020-01-15 17:53 ` Ira Weiny
2020-01-10 19:29 ` [RFC PATCH V2 10/12] fs/xfs: Fix truncate up ira.weiny
2020-01-13 22:27 ` Darrick J. Wong
2020-01-14 0:40 ` Ira Weiny
2020-01-14 1:14 ` Darrick J. Wong
2020-01-14 19:00 ` Ira Weiny
2020-01-14 19:39 ` Ira Weiny
2020-01-10 19:29 ` [RFC PATCH V2 11/12] fs/xfs: Clean up locking in dax invalidate ira.weiny
2020-01-10 19:29 ` ira.weiny [this message]
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=20200110192942.25021-13-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).