* [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" @ 2019-05-21 18:06 Jaegeuk Kim 2019-05-21 18:06 ` [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period Jaegeuk Kim 2019-05-22 12:29 ` [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Chao Yu 0 siblings, 2 replies; 6+ messages in thread From: Jaegeuk Kim @ 2019-05-21 18:06 UTC (permalink / raw) To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim This reverts commit fb40d618b03978b7cc5820697894461f4a2af98b. The original patch introduced # of fsck triggers. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/checkpoint.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index d0539ddad6e2..89825261d474 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -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); -- 2.19.0.605.g01d371f741-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period 2019-05-21 18:06 [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Jaegeuk Kim @ 2019-05-21 18:06 ` Jaegeuk Kim 2019-05-22 12:32 ` [f2fs-dev] " Chao Yu 2019-05-22 12:29 ` [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Chao Yu 1 sibling, 1 reply; 6+ messages in thread From: Jaegeuk Kim @ 2019-05-21 18:06 UTC (permalink / raw) To: linux-kernel, linux-f2fs-devel; +Cc: Jaegeuk Kim This patch allows to use ssr during checkpoint is disabled. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/gc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 963fb4571fd9..1e029da26053 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -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; -- 2.19.0.605.g01d371f741-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period 2019-05-21 18:06 ` [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period Jaegeuk Kim @ 2019-05-22 12:32 ` Chao Yu 0 siblings, 0 replies; 6+ messages in thread From: Chao Yu @ 2019-05-22 12:32 UTC (permalink / raw) To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel On 2019-5-22 2:06, Jaegeuk Kim wrote: > This patch allows to use ssr during checkpoint is disabled. > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> > --- > fs/f2fs/gc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c > index 963fb4571fd9..1e029da26053 100644 > --- a/fs/f2fs/gc.c > +++ b/fs/f2fs/gc.c > @@ -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, Reviewed-by: Chao Yu <yuchao0@huawei.com> Thanks, > goto next; > if (gc_type == BG_GC && test_bit(secno, dirty_i->victim_secmap)) > goto next; > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" 2019-05-21 18:06 [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Jaegeuk Kim 2019-05-21 18:06 ` [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period Jaegeuk Kim @ 2019-05-22 12:29 ` Chao Yu 2019-05-22 17:44 ` Jaegeuk Kim 1 sibling, 1 reply; 6+ messages in thread From: Chao Yu @ 2019-05-22 12:29 UTC (permalink / raw) To: Jaegeuk Kim, linux-kernel, linux-f2fs-devel On 2019-5-22 2:06, Jaegeuk Kim wrote: > 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, > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> > --- > fs/f2fs/checkpoint.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index d0539ddad6e2..89825261d474 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -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); > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" 2019-05-22 12:29 ` [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Chao Yu @ 2019-05-22 17:44 ` Jaegeuk Kim 2019-05-23 13:17 ` Chao Yu 0 siblings, 1 reply; 6+ messages in thread From: Jaegeuk Kim @ 2019-05-22 17:44 UTC (permalink / raw) To: Chao Yu; +Cc: linux-kernel, linux-f2fs-devel On 05/22, Chao Yu wrote: > On 2019-5-22 2:06, Jaegeuk Kim wrote: > > 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. From e1b7de7050fd87b7c20e033b062b1cc6505679d3 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim <jaegeuk@kernel.org> 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. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/checkpoint.c | 6 ++---- 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 d0539ddad6e2..89825261d474 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -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); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 856f9081c599..34f2adf191ed 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -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)) { -- 2.19.0.605.g01d371f741-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" 2019-05-22 17:44 ` Jaegeuk Kim @ 2019-05-23 13:17 ` Chao Yu 0 siblings, 0 replies; 6+ messages in thread From: Chao Yu @ 2019-05-23 13:17 UTC (permalink / raw) To: Jaegeuk Kim; +Cc: linux-kernel, linux-f2fs-devel On 2019-5-23 1:44, Jaegeuk Kim wrote: > On 05/22, Chao Yu wrote: >> On 2019-5-22 2:06, Jaegeuk Kim wrote: >>> 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. Alright. > > From e1b7de7050fd87b7c20e033b062b1cc6505679d3 Mon Sep 17 00:00:00 2001 > From: Jaegeuk Kim <jaegeuk@kernel.org> > 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. > > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Good catch! Reviewed-by: Chao Yu <yuchao0@huawei.com> Thanks, > --- > fs/f2fs/checkpoint.c | 6 ++---- > 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 d0539ddad6e2..89825261d474 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -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); > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c > index 856f9081c599..34f2adf191ed 100644 > --- a/fs/f2fs/super.c > +++ b/fs/f2fs/super.c > @@ -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)) { > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-23 13:17 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-21 18:06 [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Jaegeuk Kim 2019-05-21 18:06 ` [PATCH 2/2] f2fs: allow ssr block allocation during checkpoint=disable period Jaegeuk Kim 2019-05-22 12:32 ` [f2fs-dev] " Chao Yu 2019-05-22 12:29 ` [f2fs-dev] [PATCH 1/2] Revert "f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG" Chao Yu 2019-05-22 17:44 ` Jaegeuk Kim 2019-05-23 13:17 ` Chao Yu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).