f2fs: link f2fs quota ops for sysfile
This patch reverts:
commit fb40d618b0
("f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG").
We were missing error handlers used in f2fs quota ops.
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
e0654264c4
commit
bc88ac96a9
|
@ -1328,10 +1328,8 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc)
|
||||||
|
|
||||||
if (is_sbi_flag_set(sbi, SBI_QUOTA_SKIP_FLUSH))
|
if (is_sbi_flag_set(sbi, SBI_QUOTA_SKIP_FLUSH))
|
||||||
__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
|
__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
|
||||||
/*
|
else
|
||||||
* TODO: we count on fsck.f2fs to clear this flag until we figure out
|
__clear_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
|
||||||
* missing cases which clear it incorrectly.
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_REPAIR))
|
if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_REPAIR))
|
||||||
__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
|
__set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG);
|
||||||
|
|
|
@ -3160,10 +3160,7 @@ try_onemore:
|
||||||
|
|
||||||
#ifdef CONFIG_QUOTA
|
#ifdef CONFIG_QUOTA
|
||||||
sb->dq_op = &f2fs_quota_operations;
|
sb->dq_op = &f2fs_quota_operations;
|
||||||
if (f2fs_sb_has_quota_ino(sbi))
|
sb->s_qcop = &f2fs_quotactl_ops;
|
||||||
sb->s_qcop = &dquot_quotactl_sysfile_ops;
|
|
||||||
else
|
|
||||||
sb->s_qcop = &f2fs_quotactl_ops;
|
|
||||||
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;
|
sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ;
|
||||||
|
|
||||||
if (f2fs_sb_has_quota_ino(sbi)) {
|
if (f2fs_sb_has_quota_ino(sbi)) {
|
||||||
|
|
Loading…
Reference in New Issue