f2fs: inode: fix to do sanity check on extent cache correctly

commit 269d119481008cd725ce32553332593c0ecfc91c upstream.

In do_read_inode(), sanity check for extent cache should be called after
f2fs_init_read_extent_tree(), fix it.

Fixes: 72840cccc0a1 ("f2fs: allocate the extent_cache by default")
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index cb8fb2fdfce2a4a110653e52cd1a0a8e6aa07d60..16692c96e76504d699a09159fa854dce22c147e0 100644 (file)
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -15,6 +15,31 @@
 #include "node.h"
 #include <trace/events/f2fs.h>
 
+bool sanity_check_extent_cache(struct inode *inode)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+       struct f2fs_inode_info *fi = F2FS_I(inode);
+       struct extent_info *ei;
+
+       if (!fi->extent_tree[EX_READ])
+               return true;
+
+       ei = &fi->extent_tree[EX_READ]->largest;
+
+       if (ei->len &&
+               (!f2fs_is_valid_blkaddr(sbi, ei->blk,
+                                       DATA_GENERIC_ENHANCE) ||
+               !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
+                                       DATA_GENERIC_ENHANCE))) {
+               set_sbi_flag(sbi, SBI_NEED_FSCK);
+               f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
+                         __func__, inode->i_ino,
+                         ei->blk, ei->fofs, ei->len);
+               return false;
+       }
+       return true;
+}
+
 static void __set_extent_info(struct extent_info *ei,
                                unsigned int fofs, unsigned int len,
                                block_t blk, bool keep_clen,

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6fb08b3520a68e55aa688c6de86aa6157a350c22..a0a232551da97484c6326235100174468dac9887 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4125,6 +4125,7 @@ void f2fs_leave_shrinker(struct f2fs_sb_info *sbi);
 /*
  * extent_cache.c
  */
+bool sanity_check_extent_cache(struct inode *inode);
 struct rb_entry *f2fs_lookup_rb_tree(struct rb_root_cached *root,
                                struct rb_entry *cached_re, unsigned int ofs);
 struct rb_node **f2fs_lookup_rb_tree_for_insert(struct f2fs_sb_info *sbi,

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 8110c52d1457a00f5bea709a355c2432425a1c96..aab3b8b3ab0a7b322a9ece589c762e5474d3be8f 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -262,22 +262,6 @@ static bool sanity_check_inode(struct inode *inode, struct page *node_page)
                return false;
        }
 
-       if (fi->extent_tree[EX_READ]) {
-               struct extent_info *ei = &fi->extent_tree[EX_READ]->largest;
-
-               if (ei->len &&
-                       (!f2fs_is_valid_blkaddr(sbi, ei->blk,
-                                               DATA_GENERIC_ENHANCE) ||
-                       !f2fs_is_valid_blkaddr(sbi, ei->blk + ei->len - 1,
-                                               DATA_GENERIC_ENHANCE))) {
-                       set_sbi_flag(sbi, SBI_NEED_FSCK);
-                       f2fs_warn(sbi, "%s: inode (ino=%lx) extent info [%u, %u, %u] is incorrect, run fsck to fix",
-                                 __func__, inode->i_ino,
-                                 ei->blk, ei->fofs, ei->len);
-                       return false;
-               }
-       }
-
        if (f2fs_sanity_check_inline_data(inode)) {
                set_sbi_flag(sbi, SBI_NEED_FSCK);
                f2fs_warn(sbi, "%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix",
@@ -481,6 +465,12 @@ static int do_read_inode(struct inode *inode)
                return -EFSCORRUPTED;
        }
 
+       if (!sanity_check_extent_cache(inode)) {
+               f2fs_put_page(node_page, 1);
+               f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE);
+               return -EFSCORRUPTED;
+       }
+
        f2fs_put_page(node_page, 1);
 
        stat_inc_inline_xattr(inode);