[PATCH AUTOSEL 5.1 045/186] f2fs: fix error path of recovery

[Sasha Levin]

From: Chao Yu <yuch...@huawei.com>

[ Upstream commit 988385795c7f46b231982d54750587f204bd558b ]

There are some places in where we missed to unlock page or unlock page
incorrectly, fix them.

Signed-off-by: Chao Yu <yuch...@huawei.com>
Signed-off-by: Jaegeuk Kim <jaeg...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 fs/f2fs/recovery.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 73338c432e7e4..b14c718139a96 100644
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -325,8 +325,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, 
struct list_head *head,
                        break;
                }
 
-               if (!is_recoverable_dnode(page))
+               if (!is_recoverable_dnode(page)) {
+                       f2fs_put_page(page, 1);
                        break;
+               }
 
                if (!is_fsync_dnode(page))
                        goto next;
@@ -338,8 +340,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, 
struct list_head *head,
                        if (!check_only &&
                                        IS_INODE(page) && is_dent_dnode(page)) {
                                err = f2fs_recover_inode_page(sbi, page);
-                               if (err)
+                               if (err) {
+                                       f2fs_put_page(page, 1);
                                        break;
+                               }
                                quota_inode = true;
                        }
 
@@ -355,6 +359,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, 
struct list_head *head,
                                        err = 0;
                                        goto next;
                                }
+                               f2fs_put_page(page, 1);
                                break;
                        }
                }
@@ -370,6 +375,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, 
struct list_head *head,
                                "%s: detect looped node chain, "
                                "blkaddr:%u, next:%u",
                                __func__, blkaddr, next_blkaddr_of_node(page));
+                       f2fs_put_page(page, 1);
                        err = -EINVAL;
                        break;
                }
@@ -380,7 +386,6 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, 
struct list_head *head,
 
                f2fs_ra_meta_pages_cond(sbi, blkaddr);
        }
-       f2fs_put_page(page, 1);
        return err;
 }
 
@@ -674,8 +679,10 @@ static int recover_data(struct f2fs_sb_info *sbi, struct 
list_head *inode_list,
                 */
                if (IS_INODE(page)) {
                        err = recover_inode(entry->inode, page);
-                       if (err)
+                       if (err) {
+                               f2fs_put_page(page, 1);
                                break;
+                       }
                }
                if (entry->last_dentry == blkaddr) {
                        err = recover_dentry(entry->inode, page, dir_list);
-- 
2.20.1