f2fs: fix to do sanity check on extent cache correctly

commit d48a7b3a72f121655d95b5157c32c7d555e44c05 upstream.

In do_read_inode(), sanity_check_inode() 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/inode.c b/fs/f2fs/inode.c
index 2bda4e73fc1cef37d290b726fea95e0d571300da..8110c52d1457a00f5bea709a355c2432425a1c96 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -413,12 +413,6 @@ static int do_read_inode(struct inode *inode)
                fi->i_inline_xattr_size = 0;
        }
 
-       if (!sanity_check_inode(inode, node_page)) {
-               f2fs_put_page(node_page, 1);
-               f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE);
-               return -EFSCORRUPTED;
-       }
-
        /* check data exist */
        if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
                __recover_inline_status(inode, node_page);
@@ -481,6 +475,12 @@ static int do_read_inode(struct inode *inode)
        /* Need all the flag bits */
        f2fs_init_read_extent_tree(inode, node_page);
 
+       if (!sanity_check_inode(inode, node_page)) {
+               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);