f2fs: fix error path in do_recover_data()

- don't panic kernel if f2fs_get_node_page() fails in
f2fs_recover_inline_data() or f2fs_recover_inline_xattr();
- return error number of f2fs_truncate_blocks() to
f2fs_recover_inline_data()'s caller;

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index b747223860d57b753ff02e71fb9151a60a88e168..f880b47a6671c546fd9b793cec1613f2f97ce6c2 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3302,7 +3302,7 @@ bool f2fs_alloc_nid(struct f2fs_sb_info *sbi, nid_t *nid);
 void f2fs_alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid);
 void f2fs_alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);
 int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);
-void f2fs_recover_inline_xattr(struct inode *inode, struct page *page);
+int f2fs_recover_inline_xattr(struct inode *inode, struct page *page);
 int f2fs_recover_xattr_data(struct inode *inode, struct page *page);
 int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);
 int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
@@ -3769,7 +3769,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page);
 int f2fs_convert_inline_inode(struct inode *inode);
 int f2fs_try_convert_inline_dir(struct inode *dir, struct dentry *dentry);
 int f2fs_write_inline_data(struct inode *inode, struct page *page);
-bool f2fs_recover_inline_data(struct inode *inode, struct page *npage);
+int f2fs_recover_inline_data(struct inode *inode, struct page *npage);
 struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,
                                        const struct f2fs_filename *fname,
                                        struct page **res_page);

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index def4b8481883aac2219cfb02d102c604a4ab56da..102df444f623c0643a0be15a3eb6971a79e69935 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -254,7 +254,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page)
        return 0;
 }
 
-bool f2fs_recover_inline_data(struct inode *inode, struct page *npage)
+int f2fs_recover_inline_data(struct inode *inode, struct page *npage)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        struct f2fs_inode *ri = NULL;
@@ -276,7 +276,8 @@ bool f2fs_recover_inline_data(struct inode *inode, struct page *npage)
                        ri && (ri->i_inline & F2FS_INLINE_DATA)) {
 process_inline:
                ipage = f2fs_get_node_page(sbi, inode->i_ino);
-               f2fs_bug_on(sbi, IS_ERR(ipage));
+               if (IS_ERR(ipage))
+                       return PTR_ERR(ipage);
 
                f2fs_wait_on_page_writeback(ipage, NODE, true, true);
 
@@ -289,21 +290,25 @@ process_inline:
 
                set_page_dirty(ipage);
                f2fs_put_page(ipage, 1);
-               return true;
+               return 1;
        }
 
        if (f2fs_has_inline_data(inode)) {
                ipage = f2fs_get_node_page(sbi, inode->i_ino);
-               f2fs_bug_on(sbi, IS_ERR(ipage));
+               if (IS_ERR(ipage))
+                       return PTR_ERR(ipage);
                f2fs_truncate_inline_inode(inode, ipage, 0);
                clear_inode_flag(inode, FI_INLINE_DATA);
                f2fs_put_page(ipage, 1);
        } else if (ri && (ri->i_inline & F2FS_INLINE_DATA)) {
-               if (f2fs_truncate_blocks(inode, 0, false))
-                       return false;
+               int ret;
+
+               ret = f2fs_truncate_blocks(inode, 0, false);
+               if (ret)
+                       return ret;
                goto process_inline;
        }
-       return false;
+       return 0;
 }
 
 struct f2fs_dir_entry *f2fs_find_in_inline_dir(struct inode *dir,

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 6551d5e35c0579d3ba74c38eca5f92c0412809cd..85ebdd0e3e7c09a436339dc0f32a3f3181565a8d 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2572,7 +2572,7 @@ int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink)
        return nr - nr_shrink;
 }
 
-void f2fs_recover_inline_xattr(struct inode *inode, struct page *page)
+int f2fs_recover_inline_xattr(struct inode *inode, struct page *page)
 {
        void *src_addr, *dst_addr;
        size_t inline_size;
@@ -2580,7 +2580,8 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page)
        struct f2fs_inode *ri;
 
        ipage = f2fs_get_node_page(F2FS_I_SB(inode), inode->i_ino);
-       f2fs_bug_on(F2FS_I_SB(inode), IS_ERR(ipage));
+       if (IS_ERR(ipage))
+               return PTR_ERR(ipage);
 
        ri = F2FS_INODE(page);
        if (ri->i_inline & F2FS_INLINE_XATTR) {
@@ -2599,6 +2600,7 @@ void f2fs_recover_inline_xattr(struct inode *inode, struct page *page)
 update_inode:
        f2fs_update_inode(inode, ipage);
        f2fs_put_page(ipage, 1);
+       return 0;
 }
 
 int f2fs_recover_xattr_data(struct inode *inode, struct page *page)

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index af974ba273b323de3588780172286682195ff915..4f12ade6410a133c8479c0e215a468da28a6b3f2 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -544,7 +544,9 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
 
        /* step 1: recover xattr */
        if (IS_INODE(page)) {
-               f2fs_recover_inline_xattr(inode, page);
+               err = f2fs_recover_inline_xattr(inode, page);
+               if (err)
+                       goto out;
        } else if (f2fs_has_xattr_block(ofs_of_node(page))) {
                err = f2fs_recover_xattr_data(inode, page);
                if (!err)
@@ -553,8 +555,12 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
        }
 
        /* step 2: recover inline data */
-       if (f2fs_recover_inline_data(inode, page))
+       err = f2fs_recover_inline_data(inode, page);
+       if (err) {
+               if (err == 1)
+                       err = 0;
                goto out;
+       }
 
        /* step 3: recover data indices */
        start = f2fs_start_bidx_of_node(ofs_of_node(page), inode);