Skip to content

Commit 19ec1d3

Browse files
Yongpeng YangJaegeuk Kim
authored andcommitted
f2fs: Add error handling for negative returns from do_garbage_collect
The function do_garbage_collect can return a value less than 0 due to f2fs_cp_error being true or page allocation failure, as a result of calling f2fs_get_sum_page. However, f2fs_gc does not account for such cases, which could potentially lead to an abnormal total_freed and thus cause subsequent code to behave unexpectedly. Given that an f2fs_cp_error is irrecoverable, and considering that do_garbage_collect already retries page allocation errors through its call to f2fs_get_sum_page->f2fs_get_meta_page_retry, any error reported by do_garbage_collect should immediately terminate the current GC. Signed-off-by: Yongpeng Yang <yangyongpeng1@oppo.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 0145eed commit 19ec1d3

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

fs/f2fs/gc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,6 +1865,9 @@ int f2fs_gc(struct f2fs_sb_info *sbi, struct f2fs_gc_control *gc_control)
18651865

18661866
seg_freed = do_garbage_collect(sbi, segno, &gc_list, gc_type,
18671867
gc_control->should_migrate_blocks);
1868+
if (seg_freed < 0)
1869+
goto stop;
1870+
18681871
total_freed += seg_freed;
18691872

18701873
if (seg_freed == f2fs_usable_segs_in_sec(sbi, segno)) {

0 commit comments

Comments
 (0)