fsck.f2fs: Fix up nat journal corruption with -a (auto-fix) option
PATCH 1/1 fsck.f2fs: Fix up nat journal corruption with -a (auto-fix) option
Build segment manager and node manager always to catch and auto-fix invalid NAT entries found in the NAT journal.
--- fsck/mount.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
fsck/mount.c +15 -13
@@ -943,6 +943,8 @@ static int f2fs_init_nid_bitmap(struct f2fs_sb_info *sbi)"NAT_JOURNAL_ENTRIES(%lu)\n" , nats_in_cursum(journal), NAT_JOURNAL_ENTRIES); journal->n_nats =cpu_to_le16 (NAT_JOURNAL_ENTRIES ); + c.auto_fix =0 ; + c.fix_on =1 ; }for (i =0 ; i <nats_in_cursum (journal); i++) {
@@ -2363,19 +2365,6 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)print_ckpt_info (sbi); -if (c.auto_fix || c.preen_mode) { -u32 flag =get_cp (ckpt_flags); - -if (flag &CP_FSCK_FLAG || - (exist_qf_ino (sb) && (!(flag &CP_UMOUNT_FLAG ) || - flag &CP_ERROR_FLAG ))) { - c.fix_on =1 ; - }else if (!c.preen_mode) { -print_cp_state (flag); -return 1 ; - } - } - c.bug_on =0 ; c.feature = sb->feature;
@@ -2400,6 +2389,19 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)return -1 ; } +if (c.auto_fix || c.preen_mode) { +u32 flag =get_cp (ckpt_flags); + +if (flag &CP_FSCK_FLAG || + (exist_qf_ino (sb) && (!(flag &CP_UMOUNT_FLAG ) || + flag &CP_ERROR_FLAG ))) { + c.fix_on =1 ; + }else if (!c.preen_mode) { +print_cp_state (flag); +return 1 ; + } + } +/* Check nat_bits */ if (c.func !=DUMP &&is_set_ckpt_flags (cp,CP_NAT_BITS_FLAG )) {u_int32_t nat_bits_bytes, nat_bits_blocks;
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 4 lines · Sahitya Tummala
Build segment manager and node manager always to catch and auto-fix invalid NAT entries found in the NAT journal.
Signed-off-by Sahitya Tummala <[email protected]>
Thanks,
Quoted 13 lines · Sahitya Tummala
Build segment manager and node manager always to catch and auto-fix invalid NAT entries found in the NAT journal.
Signed-off-by Sahitya Tummala <[email protected]>--- fsck/mount.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)fsck/mount.c +0
-0
fsck/mount.c static int f2fs_init_nid_bitmap(struct f2fs_sb_info *sbi) · line 947
Quoted 5 lines
fsck/mount.c +2
-0@@ -943,6 +943,8 @@ static int f2fs_init_nid_bitmap(struct f2fs_sb_info *sbi)"NAT_JOURNAL_ENTRIES(%lu)\n" , nats_in_cursum(journal), NAT_JOURNAL_ENTRIES); journal->n_nats =cpu_to_le16 (NAT_JOURNAL_ENTRIES ); + c.auto_fix =0 ; + c.fix_on =1 ;
BTW, we have some more error cases below. Can we add fix_on for them as well?
1077 addr = le32_to_cpu(nat_in_journal(journal, i).block_addr);
1078 if (!IS_VALID_BLK_ADDR(sbi, addr)) {
1079 MSG(0, "\tError: f2fs_init_nid_bitmap: addr(%u) is invalid!!!\n", addr); 1080 journal->n_nats = cpu_to_le16(i); 1081 continue;
1082 }
1083
1084 nid = le32_to_cpu(nid_in_journal(journal, i));
1085 if (!IS_VALID_NID(sbi, nid)) {
1086 MSG(0, "\tError: f2fs_init_nid_bitmap: nid(%u) is invalid!!!\n", nid); 1087 journal->n_nats = cpu_to_le16(i); 1088 continue;
1089 }
Quoted 46 lines
fsck/mount.c +13
-13}for (i =0 ; i <nats_in_cursum (journal); i++) {@@ -2363,19 +2365,6 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)print_ckpt_info (sbi); -if (c.auto_fix || c.preen_mode) { -u32 flag =get_cp (ckpt_flags); - -if (flag &CP_FSCK_FLAG || - (exist_qf_ino (sb) && (!(flag &CP_UMOUNT_FLAG ) || - flag &CP_ERROR_FLAG ))) { - c.fix_on =1 ; - }else if (!c.preen_mode) { -print_cp_state (flag); -return 1 ; - } - } - c.bug_on =0 ; c.feature = sb->feature;@@ -2400,6 +2389,19 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)return -1 ; } +if (c.auto_fix || c.preen_mode) { +u32 flag =get_cp (ckpt_flags); + +if (flag &CP_FSCK_FLAG || + (exist_qf_ino (sb) && (!(flag &CP_UMOUNT_FLAG ) || + flag &CP_ERROR_FLAG ))) { + c.fix_on =1 ; + }else if (!c.preen_mode) { +print_cp_state (flag); +return 1 ; + } + } +/* Check nat_bits */ if (c.func !=DUMP &&is_set_ckpt_flags (cp,CP_NAT_BITS_FLAG )) {u_int32_t nat_bits_bytes, nat_bits_blocks;Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.