Skip to content

Commit dad48e7

Browse files
Yunlei HeJaegeuk Kim
Yunlei He
authored and
Jaegeuk Kim
committed
f2fs: fix a bug caused by NULL extent tree
Thread A: Thread B: -f2fs_remount -sbi->mount_opt.opt = 0; <--- -f2fs_iget -do_read_inode -f2fs_init_extent_tree -F2FS_I(inode)->extent_tree is NULL -default_options && parse_options -remount return <--- -f2fs_map_blocks -f2fs_lookup_extent_tree -f2fs_bug_on(sbi, !et); The same problem with f2fs_new_inode. Signed-off-by: Yunlei He <heyunlei@huawei.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 1d7be27 commit dad48e7

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

Diff for: fs/f2fs/extent_cache.c

+11-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static void __drop_largest_extent(struct inode *inode,
320320
}
321321

322322
/* return true, if inode page is changed */
323-
bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)
323+
static bool __f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)
324324
{
325325
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
326326
struct extent_tree *et;
@@ -358,6 +358,16 @@ bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)
358358
return false;
359359
}
360360

361+
bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)
362+
{
363+
bool ret = __f2fs_init_extent_tree(inode, i_ext);
364+
365+
if (!F2FS_I(inode)->extent_tree)
366+
set_inode_flag(inode, FI_NO_EXTENT);
367+
368+
return ret;
369+
}
370+
361371
static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,
362372
struct extent_info *ei)
363373
{

0 commit comments

Comments
 (0)