summaryrefslogtreecommitdiffstats
path: root/fs/f2fs
diff options
context:
space:
mode:
authorYunlong Song <yunlong.song@huawei.com>2018-10-24 16:08:30 +0800
committerJaegeuk Kim <jaegeuk@kernel.org>2018-11-26 15:53:55 -0800
commitd6c66cd19ef322fe0d51ba09ce1b7f386acab04a (patch)
treea98bdf5573f03d0e7f69dcc927f4f709f842def7 /fs/f2fs
parenta8075dc484cf10ebdb07bee2b17322fb0a846309 (diff)
downloadlinux-d6c66cd19ef322fe0d51ba09ce1b7f386acab04a.tar.gz
linux-d6c66cd19ef322fe0d51ba09ce1b7f386acab04a.tar.bz2
linux-d6c66cd19ef322fe0d51ba09ce1b7f386acab04a.zip
f2fs: fix count of seg_freed to make sec_freed correct
When sbi->segs_per_sec > 1, and if some segno has 0 valid blocks before gc starts, do_garbage_collect will skip counting seg_freed++, and this will cause seg_freed < sbi->segs_per_sec and finally skip sec_freed++. Signed-off-by: Yunlong Song <yunlong.song@huawei.com> Signed-off-by: Chao Yu <yuchao0@huawei.com> Reviewed-by: Chao Yu <yuchao0@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/gc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index c96e7c6354ef..9707773fdaac 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -1140,9 +1140,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
GET_SUM_BLOCK(sbi, segno));
f2fs_put_page(sum_page, 0);
- if (get_valid_blocks(sbi, segno, false) == 0 ||
- !PageUptodate(sum_page) ||
- unlikely(f2fs_cp_error(sbi)))
+ if (get_valid_blocks(sbi, segno, false) == 0)
+ goto freed;
+ if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi)))
goto next;
sum = page_address(sum_page);
@@ -1170,6 +1170,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
stat_inc_seg_count(sbi, type, gc_type);
+freed:
if (gc_type == FG_GC &&
get_valid_blocks(sbi, segno, false) == 0)
seg_freed++;