| author | Jaegeuk Kim <jaegeuk@google.com> | 2019-05-29 15:44:06 (GMT) |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@google.com> | 2019-05-29 15:44:06 (GMT) |
| commit | 559894432d70b4fa6b6cfdb0cb2187afb2f8f28a (patch) | |
| tree | 235949da80e61fe6d1b9d2da02705c3dda64f58f | |
| parent | 1dc2c2919d44c7490bc080fff0439fb0c28dc1dc (diff) | |
| parent | 0d347d1faad20f477fd9dbb3f2c56d288cc43cf6 (diff) | |
| download | common-559894432d70b4fa6b6cfdb0cb2187afb2f8f28a.zip common-559894432d70b4fa6b6cfdb0cb2187afb2f8f28a.tar.gz common-559894432d70b4fa6b6cfdb0cb2187afb2f8f28a.tar.bz2 | |
Merge remote-tracking branch 'origin/upstream-f2fs-stable-linux-4.9.y' into android-4.9
* origin/upstream-f2fs-stable-linux-4.9.y:
f2fs: link f2fs quota ops for sysfile
Change-Id: Ie1262544e2bc3d4d08e957d4f5e2b2dd98c20190
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
| -rw-r--r-- | fs/f2fs/checkpoint.c | 6 | ||||
| -rw-r--r-- | fs/f2fs/super.c | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index d4c5310..a5403b2 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -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)) __set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG); - /* - * TODO: we count on fsck.f2fs to clear this flag until we figure out - * missing cases which clear it incorrectly. - */ + else + __clear_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG); if (is_sbi_flag_set(sbi, SBI_QUOTA_NEED_REPAIR)) __set_ckpt_flags(ckpt, CP_QUOTA_NEED_FSCK_FLAG); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index a6de02a..09df641 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -3169,10 +3169,7 @@ try_onemore: #ifdef CONFIG_QUOTA sb->dq_op = &f2fs_quota_operations; - if (f2fs_sb_has_quota_ino(sbi)) - sb->s_qcop = &dquot_quotactl_sysfile_ops; - else - sb->s_qcop = &f2fs_quotactl_ops; + sb->s_qcop = &f2fs_quotactl_ops; sb->s_quota_types = QTYPE_MASK_USR | QTYPE_MASK_GRP | QTYPE_MASK_PRJ; if (f2fs_sb_has_quota_ino(sbi)) { |