Commit d6c66cd1 authored by Yunlong Song's avatar Yunlong Song Committed by Jaegeuk Kim

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: default avatarYunlong Song <yunlong.song@huawei.com>
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent a8075dc4
...@@ -1140,9 +1140,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, ...@@ -1140,9 +1140,9 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
GET_SUM_BLOCK(sbi, segno)); GET_SUM_BLOCK(sbi, segno));
f2fs_put_page(sum_page, 0); f2fs_put_page(sum_page, 0);
if (get_valid_blocks(sbi, segno, false) == 0 || if (get_valid_blocks(sbi, segno, false) == 0)
!PageUptodate(sum_page) || goto freed;
unlikely(f2fs_cp_error(sbi))) if (!PageUptodate(sum_page) || unlikely(f2fs_cp_error(sbi)))
goto next; goto next;
sum = page_address(sum_page); sum = page_address(sum_page);
...@@ -1170,6 +1170,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, ...@@ -1170,6 +1170,7 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,
stat_inc_seg_count(sbi, type, gc_type); stat_inc_seg_count(sbi, type, gc_type);
freed:
if (gc_type == FG_GC && if (gc_type == FG_GC &&
get_valid_blocks(sbi, segno, false) == 0) get_valid_blocks(sbi, segno, false) == 0)
seg_freed++; seg_freed++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment