Commit 7212b95e authored by Jan Kara's avatar Jan Kara
Browse files

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: default avatarJan Kara <jack@suse.cz>
parent dc19432a

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

fs/ocfs2/super.c

+2 −2
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb) 
			status = -ENOENT;

			goto out_quota_off;

		}

		status = dquot_enable(inode[type], type, QFMT_OCFS2,

		status = dquot_load_quota_inode(inode[type], type, QFMT_OCFS2,

						DQUOT_USAGE_ENABLED);

		if (status < 0)

			goto out_quota_off;