fsck.f2fs: fix to avoid assert in do_record_fsync_data()
PATCH 1/1 fsck.f2fs: fix to avoid assert in do_record_fsync_data()
As Kane Ch'in reported in bugzilla [1]
I am using some Debian VMs with f2fs root partition for development. My host machine crashed for some reason and this caused the f2fs partitions in the VMs to become corrupted. I tried to boot from Debian Live and repair the partitions but failed.
do_record_fsync_data: [node] ino = 24573, nid = 0, blkaddr = 2063580recover_data: ino = 24573, nid = 0, recorded = 0, err = 0do_record_fsync_data: [node] ino = 471286, nid = 0, blkaddr = 2063581recover_data: ino = 471286, nid = 0, recorded = 0, err = 0 [ASSERT] (do_record_fsync_data:3475) 0
During do_record_fsync_data(), if dnode in warm node chain is valid in SIT table, it's better to continue checking rather than triggering assert().
[1] https://bugzilla.kernel.org/show_bug.cgi?id=218349
--- fsck/mount.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fsck/mount.c +9 -9
@@ -3811,14 +3811,11 @@ static int do_record_fsync_data(struct f2fs_sb_info *sbi, se =get_seg_entry (sbi, segno); offset =OFFSET_IN_SEG (sbi, blkaddr); -if (f2fs_test_bit (offset, (char *)se->cur_valid_map)) { -ASSERT (0 ); -return -1 ; - } -if (f2fs_test_bit (offset, (char *)se->ckpt_valid_map)) { -ASSERT (0 ); -return -1 ; - } +if (f2fs_test_bit (offset, (char *)se->cur_valid_map)) +return 1 ; + +if (f2fs_test_bit (offset, (char *)se->ckpt_valid_map)) +return 1 ;if (!se->ckpt_valid_blocks) se->ckpt_type =CURSEG_WARM_NODE ;
@@ -3912,8 +3909,11 @@ static int traverse_dnodes(struct f2fs_sb_info *sbi, goto next; err =do_record_fsync_data (sbi, node_blk, blkaddr); -if (err) +if (err) { +if (err >0 ) + err =0 ;break ; + }if (entry->blkaddr == blkaddr)del_fsync_inode (entry);
Signature · 8 lines
2.40.1 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel