From: ira.weiny@intel.com
To: linux-ext4@vger.kernel.org,
Andreas Dilger <adilger.kernel@dilger.ca>,
"Theodore Y. Ts'o" <tytso@mit.edu>, Jan Kara <jack@suse.cz>,
Eric Biggers <ebiggers@kernel.org>
Cc: Ira Weiny <ira.weiny@intel.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Dan Williams <dan.j.williams@intel.com>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@lst.de>, Jeff Moyer <jmoyer@redhat.com>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH V5 7/9] fs/ext4: Remove jflag variable
Date: Thu, 28 May 2020 08:00:01 -0700 [thread overview]
Message-ID: <20200528150003.828793-8-ira.weiny@intel.com> (raw)
In-Reply-To: <20200528150003.828793-1-ira.weiny@intel.com>
From: Ira Weiny <ira.weiny@intel.com>
The jflag variable serves almost no purpose. Remove it.
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
Changes from V4:
New for this series.
---
fs/ext4/ioctl.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 7ccf20b1488b..e8a5cdade59f 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -300,7 +300,6 @@ static int ext4_ioctl_setflags(struct inode *inode,
int err = -EPERM, migrate = 0;
struct ext4_iloc iloc;
unsigned int oldflags, mask, i;
- unsigned int jflag;
struct super_block *sb = inode->i_sb;
/* Is it quota file? Do not allow user to mess with it */
@@ -309,9 +308,6 @@ static int ext4_ioctl_setflags(struct inode *inode,
oldflags = ei->i_flags;
- /* The JOURNAL_DATA flag is modifiable only by root */
- jflag = flags & EXT4_JOURNAL_DATA_FL;
-
err = vfs_ioc_setflags_prepare(inode, oldflags, flags);
if (err)
goto flags_out;
@@ -320,7 +316,7 @@ static int ext4_ioctl_setflags(struct inode *inode,
* The JOURNAL_DATA flag can only be changed by
* the relevant capability.
*/
- if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
+ if ((flags ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
if (!capable(CAP_SYS_RESOURCE))
goto flags_out;
}
@@ -391,7 +387,7 @@ static int ext4_ioctl_setflags(struct inode *inode,
if (err)
goto flags_out;
- if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
+ if ((flags ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
/*
* Changes to the journaling mode can cause unsafe changes to
* S_DAX if the inode is DAX
@@ -401,7 +397,8 @@ static int ext4_ioctl_setflags(struct inode *inode,
goto flags_out;
}
- err = ext4_change_inode_journal_flag(inode, jflag);
+ err = ext4_change_inode_journal_flag(inode,
+ flags & EXT4_JOURNAL_DATA_FL);
if (err)
goto flags_out;
}
--
2.25.1
next prev parent reply other threads:[~2020-05-28 15:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 14:59 [PATCH V5 0/9] Enable ext4 support for per-file/directory DAX operations ira.weiny
2020-05-28 14:59 ` [PATCH V5 1/9] fs/ext4: Narrow scope of DAX check in setflags ira.weiny
2020-05-28 14:59 ` [PATCH V5 2/9] fs/ext4: Disallow verity if inode is DAX ira.weiny
2020-05-28 14:59 ` [PATCH V5 3/9] fs/ext4: Change EXT4_MOUNT_DAX to EXT4_MOUNT_DAX_ALWAYS ira.weiny
2020-05-28 14:59 ` [PATCH V5 4/9] fs/ext4: Update ext4_should_use_dax() ira.weiny
2020-05-28 14:59 ` [PATCH V5 5/9] fs/ext4: Only change S_DAX on inode load ira.weiny
2020-05-28 15:00 ` [PATCH V5 6/9] fs/ext4: Make DAX mount option a tri-state ira.weiny
2020-05-28 15:00 ` ira.weiny [this message]
2020-05-28 15:00 ` [PATCH V5 8/9] fs/ext4: Introduce DAX inode flag ira.weiny
2020-05-28 15:00 ` [PATCH V5 9/9] Documentation/dax: Update DAX enablement for ext4 ira.weiny
2020-05-29 2:54 ` [PATCH V5 0/9] Enable ext4 support for per-file/directory DAX operations Theodore Y. Ts'o
2020-05-29 4:17 ` Theodore Y. Ts'o
2020-05-29 18:12 ` Ira Weiny
2020-06-02 15: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=20200528150003.828793-8-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=adilger.kernel@dilger.ca \
--cc=dan.j.williams@intel.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=ebiggers@kernel.org \
--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=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).