@@ -314,7 +314,6 @@ xfs_qm_scall_quotaon(
{
int error;
uint qf;
- __int64_t sbflags;
flags &= (XFS_ALL_QUOTA_ACCT | XFS_ALL_QUOTA_ENFD);
/*
@@ -322,8 +321,6 @@ xfs_qm_scall_quotaon(
*/
flags &= ~(XFS_ALL_QUOTA_ACCT);
- sbflags = 0;
-
if (flags == 0) {
xfs_debug(mp, "%s: zero flags, m_qflags=%x",
__func__, mp->m_qflags);
@@ -370,11 +367,10 @@ xfs_qm_scall_quotaon(
/*
* There's nothing to change if it's the same.
*/
- if ((qf & flags) == flags && sbflags == 0)
+ if ((qf & flags) == flags)
return -EEXIST;
- sbflags |= XFS_SB_QFLAGS;
- if ((error = xfs_qm_write_sb_changes(mp, sbflags)))
+ if ((error = xfs_qm_write_sb_changes(mp, XFS_SB_QFLAGS)))
return error;
/*
* If we aren't trying to switch on quota enforcement, we are done.
sbflags variable in xfs_qm_scall_quotaon() was practically unused (we only set it to constant at one place and used it elsewhere). Remove it. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/xfs/xfs_qm_syscalls.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)