f2fs: fix error path of __f2fs_build_free_nids

If NAT is corrupted, let scan_nat_page() return EFSCORRUPTED, so that,
caller can set SBI_NEED_FSCK flag into checkpoint for later repair by
fsck.

Also, this patch introduces a new fscorrupted error flag, and in above
scenario, it will persist the error flag into superblock synchronously
to avoid it has no luck to trigger a checkpoint to record SBI_NEED_FSCK

Signed-off-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index a2b2c6c7f66d867cb38cd91c503e13cfc4fa4110..1c8bf56c834cf3a41c6c30053f8774c04eba253c 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2389,7 +2389,7 @@ static int scan_nat_page(struct f2fs_sb_info *sbi,
                blk_addr = le32_to_cpu(nat_blk->entries[i].block_addr);
 
                if (blk_addr == NEW_ADDR)
-                       return -EINVAL;
+                       return -EFSCORRUPTED;
 
                if (blk_addr == NULL_ADDR) {
                        add_free_nid(sbi, start_nid, true, true);
@@ -2504,7 +2504,14 @@ static int __f2fs_build_free_nids(struct f2fs_sb_info *sbi,
 
                        if (ret) {
                                f2fs_up_read(&nm_i->nat_tree_lock);
-                               f2fs_err(sbi, "NAT is corrupt, run fsck to fix it");
+
+                               if (ret == -EFSCORRUPTED) {
+                                       f2fs_err(sbi, "NAT is corrupt, run fsck to fix it");
+                                       set_sbi_flag(sbi, SBI_NEED_FSCK);
+                                       f2fs_handle_error(sbi,
+                                               ERROR_INCONSISTENT_NAT);
+                               }
+
                                return ret;
                        }
                }

diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h
index 07ed69c2840dd34b6c796b013327154cc5e9b57c..039fe0ce8d83d1d7ca80c306f4008f2a56713736 100644 (file)
--- a/include/linux/f2fs_fs.h
+++ b/include/linux/f2fs_fs.h
@@ -104,6 +104,7 @@ enum f2fs_error {
        ERROR_CORRUPTED_VERITY_XATTR,
        ERROR_CORRUPTED_XATTR,
        ERROR_INVALID_NODE_REFERENCE,
+       ERROR_INCONSISTENT_NAT,
        ERROR_MAX,
 };