Commit fcebc794 authored by Ira Weiny's avatar Ira Weiny Committed by Theodore Ts'o

fs/ext4: Remove jflag variable

The jflag variable serves almost no purpose.  Remove it.
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>

Link: https://lore.kernel.org/r/20200528150003.828793-8-ira.weiny@intel.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 9cb20f94
...@@ -300,7 +300,6 @@ static int ext4_ioctl_setflags(struct inode *inode, ...@@ -300,7 +300,6 @@ static int ext4_ioctl_setflags(struct inode *inode,
int err = -EPERM, migrate = 0; int err = -EPERM, migrate = 0;
struct ext4_iloc iloc; struct ext4_iloc iloc;
unsigned int oldflags, mask, i; unsigned int oldflags, mask, i;
unsigned int jflag;
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
/* Is it quota file? Do not allow user to mess with it */ /* Is it quota file? Do not allow user to mess with it */
...@@ -309,9 +308,6 @@ static int ext4_ioctl_setflags(struct inode *inode, ...@@ -309,9 +308,6 @@ static int ext4_ioctl_setflags(struct inode *inode,
oldflags = ei->i_flags; 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); err = vfs_ioc_setflags_prepare(inode, oldflags, flags);
if (err) if (err)
goto flags_out; goto flags_out;
...@@ -320,7 +316,7 @@ static int ext4_ioctl_setflags(struct inode *inode, ...@@ -320,7 +316,7 @@ static int ext4_ioctl_setflags(struct inode *inode,
* The JOURNAL_DATA flag can only be changed by * The JOURNAL_DATA flag can only be changed by
* the relevant capability. * the relevant capability.
*/ */
if ((jflag ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) { if ((flags ^ oldflags) & (EXT4_JOURNAL_DATA_FL)) {
if (!capable(CAP_SYS_RESOURCE)) if (!capable(CAP_SYS_RESOURCE))
goto flags_out; goto flags_out;
} }
...@@ -391,7 +387,7 @@ static int ext4_ioctl_setflags(struct inode *inode, ...@@ -391,7 +387,7 @@ static int ext4_ioctl_setflags(struct inode *inode,
if (err) if (err)
goto flags_out; 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 * Changes to the journaling mode can cause unsafe changes to
* S_DAX if the inode is DAX * S_DAX if the inode is DAX
...@@ -401,7 +397,8 @@ static int ext4_ioctl_setflags(struct inode *inode, ...@@ -401,7 +397,8 @@ static int ext4_ioctl_setflags(struct inode *inode,
goto flags_out; 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) if (err)
goto flags_out; goto flags_out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment