diff mbox series

[4.9.y] f2fs: fix a bug caused by NULL extent tree

Message ID 1519825601-13329-1-git-send-email-nborisov@suse.com
State New
Headers show
Series [4.9.y] f2fs: fix a bug caused by NULL extent tree | expand

Commit Message

Nikolay Borisov Feb. 28, 2018, 1:46 p.m. UTC 
From: Yunlei He <heyunlei@huawei.com>


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>

Signed-off-by: Nikolay Borisov <nborisov@suse.com>

---
Hi, 

Here is the 4.9.y backport

 fs/f2fs/extent_cache.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

-- 
2.7.4

Comments

Greg KH Feb. 28, 2018, 2:44 p.m. UTC | #1 
On Wed, Feb 28, 2018 at 03:46:41PM +0200, Nikolay Borisov wrote:
> From: Yunlei He <heyunlei@huawei.com>

> 

> 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>

> Signed-off-by: Nikolay Borisov <nborisov@suse.com>

> ---

> Hi, 

> 

> Here is the 4.9.y backport


Thanks, both now applied.

greg k-h
diff mbox series

Patch

diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c
index 7b32ce979fe1..63e519658d73 100644
--- a/fs/f2fs/extent_cache.c
+++ b/fs/f2fs/extent_cache.c
@@ -177,7 +177,7 @@  static void __drop_largest_extent(struct inode *inode,
 }
 
 /* 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 extent_tree *et;
@@ -215,6 +215,16 @@  bool f2fs_init_extent_tree(struct inode *inode, struct f2fs_extent *i_ext)
 	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,
 							struct extent_info *ei)
 {