From: ira.weiny@intel.com
To: linux-kernel@vger.kernel.org
Cc: Ira Weiny <ira.weiny@intel.com>,
kbuild test robot <lkp@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 V5 11/12] fs/xfs: Remove xfs_diflags_to_linux()
Date: Wed, 26 Feb 2020 21:24:41 -0800 [thread overview]
Message-ID: <20200227052442.22524-12-ira.weiny@intel.com> (raw)
In-Reply-To: <20200227052442.22524-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The functionality in xfs_diflags_to_linux() is now identical to
xfs_diflags_to_iflags().
Remove xfs_diflags_to_linux() and call xfs_diflags_to_iflags() directly.
While we are here simplify xfs_diflags_to_iflags() to take just struct
xfs_inode.
And use xfs_ip2xflags() to ensure future diflags are included correctly.
Signed-off-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V4:
Pick up lkp build suggestion (make xfs_inode_enable_dax() static)
---
fs/xfs/xfs_inode.h | 2 +-
fs/xfs/xfs_ioctl.c | 32 +-------------------------------
fs/xfs/xfs_iops.c | 31 +++++++++++++++++++------------
3 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
index 7d4968915dec..2c8c2804f88b 100644
--- a/fs/xfs/xfs_inode.h
+++ b/fs/xfs/xfs_inode.h
@@ -467,7 +467,7 @@ int xfs_break_layouts(struct inode *inode, uint *iolock,
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);
-extern bool xfs_inode_enable_dax(struct xfs_inode *ip);
+extern void xfs_diflags_to_iflags(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 38e91de44a6f..bd67359a3251 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1100,36 +1100,6 @@ xfs_flags2diflags2(
return di_flags2;
}
-STATIC void
-xfs_diflags_to_linux(
- struct xfs_inode *ip)
-{
- struct inode *inode = VFS_I(ip);
- unsigned int xflags = xfs_ip2xflags(ip);
-
- if (xflags & FS_XFLAG_IMMUTABLE)
- inode->i_flags |= S_IMMUTABLE;
- else
- inode->i_flags &= ~S_IMMUTABLE;
- if (xflags & FS_XFLAG_APPEND)
- inode->i_flags |= S_APPEND;
- else
- inode->i_flags &= ~S_APPEND;
- if (xflags & FS_XFLAG_SYNC)
- inode->i_flags |= S_SYNC;
- else
- inode->i_flags &= ~S_SYNC;
- if (xflags & FS_XFLAG_NOATIME)
- inode->i_flags |= S_NOATIME;
- else
- inode->i_flags &= ~S_NOATIME;
-
- if (xfs_inode_enable_dax(ip))
- inode->i_flags |= S_DAX;
- else
- inode->i_flags &= ~S_DAX;
-}
-
static int
xfs_ioctl_setattr_xflags(
struct xfs_trans *tp,
@@ -1167,7 +1137,7 @@ xfs_ioctl_setattr_xflags(
ip->i_d.di_flags = xfs_flags2diflags(ip, fa->fsx_xflags);
ip->i_d.di_flags2 = di_flags2;
- xfs_diflags_to_linux(ip);
+ xfs_diflags_to_iflags(ip);
xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
XFS_STATS_INC(mp, xs_ig_attrchg);
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 8f023be39705..c63cf0b73b75 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1259,7 +1259,7 @@ xfs_inode_supports_dax(
return xfs_inode_buftarg(ip)->bt_daxdev != NULL;
}
-bool
+static bool
xfs_inode_enable_dax(
struct xfs_inode *ip)
{
@@ -1273,26 +1273,33 @@ xfs_inode_enable_dax(
return false;
}
-STATIC void
+void
xfs_diflags_to_iflags(
- struct inode *inode,
struct xfs_inode *ip)
{
- uint16_t flags = ip->i_d.di_flags;
-
- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | S_SYNC |
- S_NOATIME | S_DAX);
+ struct inode *inode = VFS_I(ip);
+ uint16_t diflags = xfs_ip2xflags(ip);
- if (flags & XFS_DIFLAG_IMMUTABLE)
+ if (diflags & FS_XFLAG_IMMUTABLE)
inode->i_flags |= S_IMMUTABLE;
- if (flags & XFS_DIFLAG_APPEND)
+ else
+ inode->i_flags &= ~S_IMMUTABLE;
+ if (diflags & FS_XFLAG_APPEND)
inode->i_flags |= S_APPEND;
- if (flags & XFS_DIFLAG_SYNC)
+ else
+ inode->i_flags &= ~S_APPEND;
+ if (diflags & FS_XFLAG_SYNC)
inode->i_flags |= S_SYNC;
- if (flags & XFS_DIFLAG_NOATIME)
+ else
+ inode->i_flags &= ~S_SYNC;
+ if (diflags & FS_XFLAG_NOATIME)
inode->i_flags |= S_NOATIME;
+ else
+ inode->i_flags &= ~S_NOATIME;
if (xfs_inode_enable_dax(ip))
inode->i_flags |= S_DAX;
+ else
+ inode->i_flags &= ~S_DAX;
}
/*
@@ -1321,7 +1328,7 @@ xfs_setup_inode(
inode->i_gid = xfs_gid_to_kgid(ip->i_d.di_gid);
i_size_write(inode, ip->i_d.di_size);
- xfs_diflags_to_iflags(inode, ip);
+ xfs_diflags_to_iflags(ip);
if (S_ISDIR(inode->i_mode)) {
/*
--
2.21.0
next prev parent reply other threads:[~2020-02-27 5:33 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 5:24 [PATCH V5 00/12] Enable per-file/per-directory DAX operations V5 ira.weiny
2020-02-27 5:24 ` [PATCH V5 01/12] fs/xfs: Remove unnecessary initialization of i_rwsem ira.weiny
2020-02-27 17:25 ` Ira Weiny
2020-02-27 5:24 ` [PATCH V5 02/12] fs: Remove unneeded IS_DAX() check ira.weiny
2020-02-27 5:24 ` [PATCH V5 03/12] fs/stat: Define DAX statx attribute ira.weiny
2020-02-27 5:24 ` [PATCH V5 04/12] fs/xfs: Isolate the physical DAX flag from enabled ira.weiny
2020-02-27 5:24 ` [PATCH V5 05/12] fs/xfs: Create function xfs_inode_enable_dax() ira.weiny
2020-03-01 22:37 ` Dave Chinner
2020-02-27 5:24 ` [PATCH V5 06/12] fs: Add locking for a dynamic address space operations state ira.weiny
2020-03-02 1:26 ` Dave Chinner
2020-03-02 1:36 ` Dave Chinner
2020-02-27 5:24 ` [PATCH V5 07/12] fs: Prevent DAX state change if file is mmap'ed ira.weiny
2020-02-27 5:24 ` [PATCH V5 08/12] fs/xfs: Hold off aops users while changing DAX state ira.weiny
2020-02-27 5:24 ` [PATCH V5 09/12] fs/xfs: Clean up locking in dax invalidate ira.weiny
2020-02-27 5:24 ` [PATCH V5 10/12] fs/xfs: Allow toggle of effective DAX flag ira.weiny
2020-02-27 5:24 ` ira.weiny [this message]
2020-02-27 5:24 ` [PATCH V5 12/12] Documentation/dax: Update Usage section ira.weiny
2020-03-05 15:51 ` [PATCH V5 00/12] Enable per-file/per-directory DAX operations V5 Christoph Hellwig
2020-03-09 17:04 ` Ira Weiny
2020-03-11 3:36 ` Darrick J. Wong
2020-03-11 6:29 ` Christoph Hellwig
2020-03-11 17:07 ` Dan Williams
2020-03-16 9:52 ` Jan Kara
2020-03-16 9:55 ` Christoph Hellwig
2020-04-01 4:00 ` Darrick J. Wong
2020-04-01 10:25 ` Jan Kara
2020-04-02 8:53 ` Christoph Hellwig
2020-04-02 20:55 ` Ira Weiny
2020-04-03 7:27 ` Christoph Hellwig
2020-04-03 15:48 ` Ira Weiny
2020-04-03 17:03 ` Jan Kara
2020-04-03 18:18 ` Ira Weiny
2020-04-03 18:21 ` Ira Weiny
2020-04-03 18:37 ` Darrick J. Wong
2020-04-05 6:19 ` Ira Weiny
2020-04-06 10:00 ` Jan Kara
2020-04-03 18:29 ` Darrick J. Wong
2020-04-03 16:05 ` Darrick J. Wong
2020-04-03 4:39 ` Ira Weiny
2020-03-11 6:39 ` Dave Chinner
2020-03-11 6:44 ` Christoph Hellwig
2020-03-11 17:07 ` Dan Williams
2020-03-12 0:49 ` Dave Chinner
2020-03-12 3:00 ` Darrick J. Wong
2020-03-12 7:27 ` Christoph Hellwig
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=20200227052442.22524-12-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=lkp@intel.com \
--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).