Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG"
Jaegeuk Kim
maintainerPATCH 1/2 Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG"
This reverts commit fb40d618b03978b7cc5820697894461f4a2af98b.
The original patch introduced # of fsck triggers.
--- fs/f2fs/checkpoint.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/f2fs/checkpoint.c +2 -4
@@ -1317,10 +1317,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 );
Signature · 1 line
2.19.0.605.g01d371f741-goog
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: allow ssr block allocation during checkpoint=disable period
This patch allows to use ssr during checkpoint is disabled.
--- fs/f2fs/gc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/gc.c +2 -1
@@ -387,7 +387,8 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, goto next;/* Don't touch checkpointed data */ if (unlikely (is_sbi_flag_set (sbi,SBI_CP_DISABLED ) && -get_ckpt_valid_blocks (sbi, segno))) +get_ckpt_valid_blocks (sbi, segno) && + p.alloc_mode !=SSR )) goto next;if (gc_type ==BG_GC &&test_bit (secno, dirty_i->victim_secmap)) goto next;
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period
Quoted 12 lines · Jaegeuk Kim
This patch allows to use ssr during checkpoint is disabled.
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/gc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)fs/f2fs/gc.c +0
-0
fs/f2fs/gc.c static int get_victim_by_default(struct f2fs_sb_info *sbi, · line 391
Quoted 6 lines
fs/f2fs/gc.c +2
-1@@ -387,7 +387,8 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi, goto next;/* Don't touch checkpointed data */ if (unlikely (is_sbi_flag_set (sbi,SBI_CP_DISABLED ) && -get_ckpt_valid_blocks (sbi, segno))) +get_ckpt_valid_blocks (sbi, segno) && + p.alloc_mode !=SSR ))
p.alloc_mode == LFS will be more straightforward. :)
Anyway,
Thanks,
Quoted 4 lines
fs/f2fs/gc.c +0
-0goto next;if (gc_type ==BG_GC &&test_bit (secno, dirty_i->victim_secmap)) goto next;
Chao Yu
maintainerQuoted 3 lines · Jaegeuk Kim
This reverts commit
fb40d618b03978b7cc5820697894461f4a2af98b.The original patch introduced # of fsck triggers.
How about pointing out the old issue has been fixed with below patch:
f2fs-tools: fix to check total valid block count before block allocation
Otherwise, user should keep kernel commit "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG".
Thanks,
Quoted 24 lines
Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/checkpoint.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)fs/f2fs/checkpoint.c +2
-4@@ -1317,10 +1317,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 );
Jaegeuk Kim
maintainerQuoted 11 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
This reverts commit
fb40d618b03978b7cc5820697894461f4a2af98b.The original patch introduced # of fsck triggers.
How about pointing out the old issue has been fixed with below patch:
f2fs-tools: fix to check total valid block count before block allocation
Otherwise, user should keep kernel commit "f2fs: don't clear
CP_QUOTA_NEED_FSCK_FLAG".
Actually, that didn't fix my testing issue, but I found we were not using error control for quota_sysfile. Now I've seen no issue with the below patch.
Quoted 1 line
From
e1b7de7050fd87b7c20e033b062b1cc6505679d3Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Mon, 20 May 2019 16:17:56 -0700
Subject: [PATCH] f2fs: link f2fs quota ops for sysfile
This patch reverts:
commit fb40d618b039 ("f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG").
We were missing error handlers used in f2fs quota ops.
--- fs/f2fs/checkpoint.c | 6 ++---- fs/f2fs/super.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-)
fs/f2fs/checkpoint.c +2 -4
@@ -1317,10 +1317,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 );
fs/f2fs/super.c +1 -4
@@ -3169,10 +3169,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)#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)) {
Signature · 1 line
2.19.0.605.g01d371f741-goog
Quoted 8 lines · Jaegeuk Kim
Quoted 7 lines · Chao Yu
Quoted 3 lines · Jaegeuk Kim
This reverts commit
fb40d618b03978b7cc5820697894461f4a2af98b.The original patch introduced # of fsck triggers.
How about pointing out the old issue has been fixed with below patch:
Quoted 7 lines
Quoted 4 lines
f2fs-tools: fix to check total valid block count before block allocation
Otherwise, user should keep kernel commit "f2fs: don't clear
CP_QUOTA_NEED_FSCK_FLAG".Actually, that didn't fix my testing issue, but I found we were not using error control for
quota_sysfile. Now I've seen no issue with the below patch.
Alright.
Quoted 6 lines
From
e1b7de7050fd87b7c20e033b062b1cc6505679d3Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Mon, 20 May 2019 16:17:56 -0700
Subject: [PATCH] f2fs: link f2fs quota ops for sysfile
Quoted 6 lines
This patch reverts:
commitfb40d618b039("f2fs: don't clearCP_QUOTA_NEED_FSCK_FLAG").We were missing error handlers used in f2fs quota ops.
Signed-off-by Jaegeuk Kim <[email protected]>
Good catch!
Thanks,
Quoted 39 lines
--- fs/f2fs/checkpoint.c | 6 ++---- fs/f2fs/super.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-)fs/f2fs/checkpoint.c +2
-4@@ -1317,10 +1317,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 );fs/f2fs/super.c +1
-4@@ -3169,10 +3169,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)#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)) {