Merge tag 'for-4.12/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[sfrench/cifs-2.6.git] / fs / quota / dquot.c

diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 74b489e3714d51cb66de83d4a9f3510c250456fe..ebf80c7739e15ebdd2bc55896d66943f3aecef9a 100644 (file)
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -2188,8 +2188,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags)
                /* This can happen when suspending quotas on remount-ro... */
                if (toputinode[cnt] && !sb_has_quota_loaded(sb, cnt)) {
                        inode_lock(toputinode[cnt]);
-                       toputinode[cnt]->i_flags &= ~(S_IMMUTABLE |
-                                 S_NOATIME | S_NOQUOTA);
+                       toputinode[cnt]->i_flags &= ~S_NOQUOTA;
                        truncate_inode_pages(&toputinode[cnt]->i_data, 0);
                        inode_unlock(toputinode[cnt]);
                        mark_inode_dirty_sync(toputinode[cnt]);
@@ -2237,7 +2236,6 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
        struct super_block *sb = inode->i_sb;
        struct quota_info *dqopt = sb_dqopt(sb);
        int error;
-       int oldflags = -1;
 
        if (!fmt)
                return -ESRCH;
@@ -2285,9 +2283,7 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,
                 * possible) Also nobody should write to the file - we use
                 * special IO operations which ignore the immutable bit. */
                inode_lock(inode);
-               oldflags = inode->i_flags & (S_NOATIME | S_IMMUTABLE |
-                                            S_NOQUOTA);
-               inode->i_flags |= S_NOQUOTA | S_NOATIME | S_IMMUTABLE;
+               inode->i_flags |= S_NOQUOTA;
                inode_unlock(inode);
                /*
                 * When S_NOQUOTA is set, remove dquot references as no more
@@ -2329,14 +2325,9 @@ out_file_init:
        dqopt->files[type] = NULL;
        iput(inode);
 out_file_flags:
-       if (oldflags != -1) {
-               inode_lock(inode);
-               /* Set the flags back (in the case of accidental quotaon()
-                * on a wrong file we don't want to mess up the flags) */
-               inode->i_flags &= ~(S_NOATIME | S_NOQUOTA | S_IMMUTABLE);
-               inode->i_flags |= oldflags;
-               inode_unlock(inode);
-       }
+       inode_lock(inode);
+       inode->i_flags &= ~S_NOQUOTA;
+       inode_unlock(inode);
 out_fmt:
        put_quota_format(fmt);
 
@@ -2780,18 +2771,6 @@ int dquot_set_dqinfo(struct super_block *sb, int type, struct qc_info *ii)
 }
 EXPORT_SYMBOL(dquot_set_dqinfo);
 
-const struct quotactl_ops dquot_quotactl_ops = {
-       .quota_on       = dquot_quota_on,
-       .quota_off      = dquot_quota_off,
-       .quota_sync     = dquot_quota_sync,
-       .get_state      = dquot_get_state,
-       .set_info       = dquot_set_dqinfo,
-       .get_dqblk      = dquot_get_dqblk,
-       .get_nextdqblk  = dquot_get_next_dqblk,
-       .set_dqblk      = dquot_set_dqblk
-};
-EXPORT_SYMBOL(dquot_quotactl_ops);
-
 const struct quotactl_ops dquot_quotactl_sysfile_ops = {
        .quota_enable   = dquot_quota_enable,
        .quota_disable  = dquot_quota_disable,