mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
f2fs: fix to do sanity check on extent cache correctly
commitd48a7b3a72upstream. In do_read_inode(), sanity_check_inode() should be called after f2fs_init_read_extent_tree(), fix it. Fixes:72840cccc0("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
18ecffd036
commit
85eb8b61dd
@@ -413,12 +413,6 @@ static int do_read_inode(struct inode *inode)
|
|||||||
fi->i_inline_xattr_size = 0;
|
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 */
|
/* check data exist */
|
||||||
if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
|
if (f2fs_has_inline_data(inode) && !f2fs_exist_data(inode))
|
||||||
__recover_inline_status(inode, node_page);
|
__recover_inline_status(inode, node_page);
|
||||||
@@ -481,6 +475,12 @@ static int do_read_inode(struct inode *inode)
|
|||||||
/* Need all the flag bits */
|
/* Need all the flag bits */
|
||||||
f2fs_init_read_extent_tree(inode, node_page);
|
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);
|
f2fs_put_page(node_page, 1);
|
||||||
|
|
||||||
stat_inc_inline_xattr(inode);
|
stat_inc_inline_xattr(inode);
|
||||||
|
|||||||
Reference in New Issue
Block a user