Skip to content

Commit bb5eb8a

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to bail out in get_new_segment()
------------[ cut here ]------------ WARNING: CPU: 3 PID: 579 at fs/f2fs/segment.c:2832 new_curseg+0x5e8/0x6dc pc : new_curseg+0x5e8/0x6dc Call trace: new_curseg+0x5e8/0x6dc f2fs_allocate_data_block+0xa54/0xe28 do_write_page+0x6c/0x194 f2fs_do_write_node_page+0x38/0x78 __write_node_page+0x248/0x6d4 f2fs_sync_node_pages+0x524/0x72c f2fs_write_checkpoint+0x4bc/0x9b0 __checkpoint_and_complete_reqs+0x80/0x244 issue_checkpoint_thread+0x8c/0xec kthread+0x114/0x1bc ret_from_fork+0x10/0x20 get_new_segment() detects inconsistent status in between free_segmap and free_secmap, let's record such error into super block, and bail out get_new_segment() instead of continue using the segment. Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 617e049 commit bb5eb8a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

fs/f2fs/segment.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2842,7 +2842,11 @@ static int get_new_segment(struct f2fs_sb_info *sbi,
28422842
}
28432843
got_it:
28442844
/* set it as dirty segment in free segmap */
2845-
f2fs_bug_on(sbi, test_bit(segno, free_i->free_segmap));
2845+
if (test_bit(segno, free_i->free_segmap)) {
2846+
ret = -EFSCORRUPTED;
2847+
f2fs_stop_checkpoint(sbi, false, STOP_CP_REASON_CORRUPTED_FREE_BITMAP);
2848+
goto out_unlock;
2849+
}
28462850

28472851
/* no free section in conventional device or conventional zone */
28482852
if (new_sec && pinning &&

include/linux/f2fs_fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ enum stop_cp_reason {
7878
STOP_CP_REASON_UPDATE_INODE,
7979
STOP_CP_REASON_FLUSH_FAIL,
8080
STOP_CP_REASON_NO_SEGMENT,
81+
STOP_CP_REASON_CORRUPTED_FREE_BITMAP,
8182
STOP_CP_REASON_MAX,
8283
};
8384

0 commit comments

Comments
 (0)