fs: Use dquot_load_quota_inode() from filesystems

Use dquot_load_quota_inode from filesystems instead of dquot_enable().
In all three cases we want to load quota inode and never use the
function to update quota flags.

Signed-off-by: Jan Kara <jack@suse.cz>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index dd654e53ba3d982d99c05b2336dd4de9132b0978..1b947c95eff22c9d7253ac8255e9f64f4629796f 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5835,7 +5835,7 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id,
        /* Don't account quota for quota files to avoid recursion */
        qf_inode->i_flags |= S_NOQUOTA;
        lockdep_set_quota_inode(qf_inode, I_DATA_SEM_QUOTA);
-       err = dquot_enable(qf_inode, type, format_id, flags);
+       err = dquot_load_quota_inode(qf_inode, type, format_id, flags);
        if (err)
                lockdep_set_quota_inode(qf_inode, I_DATA_SEM_NORMAL);
        iput(qf_inode);

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 1443cee158633d01b6b1dfee3538bde13c4860b8..91745d5b718df2ee4bfc0550fbded3887c4ed6c1 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1932,7 +1932,7 @@ static int f2fs_quota_enable(struct super_block *sb, int type, int format_id,
 
        /* Don't account quota for quota files to avoid recursion */
        qf_inode->i_flags |= S_NOQUOTA;
-       err = dquot_enable(qf_inode, type, format_id, flags);
+       err = dquot_load_quota_inode(qf_inode, type, format_id, flags);
        iput(qf_inode);
        return err;
 }

diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index c81e86c62380788f888f297bd74741d70fd1a63c..05dd68ade2937a8f4d95cfe5df701035f87e59ab 100644 (file)
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -926,8 +926,8 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb)
                        status = -ENOENT;
                        goto out_quota_off;
                }
-               status = dquot_enable(inode[type], type, QFMT_OCFS2,
-                                     DQUOT_USAGE_ENABLED);
+               status = dquot_load_quota_inode(inode[type], type, QFMT_OCFS2,
+                                               DQUOT_USAGE_ENABLED);
                if (status < 0)
                        goto out_quota_off;
        }