Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dad48e73 authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim
Browse files

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: default avatarYunlei He <heyunlei@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1d7be270

fs/f2fs/extent_cache.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ static void __drop_largest_extent(struct inode *inode, 
}

}





/* return true, if inode page is changed */

/* return true, if inode page is changed */

bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)

static bool __f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)

{

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct extent_tree *et;

	struct extent_tree *et;
@@ -358,6 +358,16 @@ bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext) 
	return false;

	return false;

}

}





bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)

{

	bool ret =  __f2fs_init_extent_tree(inode, i_ext);



	if (!F2FS_I(inode)->extent_tree)

		set_inode_flag(inode, FI_NO_EXTENT);



	return ret;

}



static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,

static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs,

							struct extent_info *ei)

							struct extent_info *ei)

{

{