evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: fix error path of recovery

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

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2019-04-10 18:45:26 +08:00 • committed by Jaegeuk Kim
parent b9973998d9
commit 0d7333632d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/f2fs/recovery.c
View file

@ -317,8 +317,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,
break; break;
} }
if (!is_recoverable_dnode(page)) if (!is_recoverable_dnode(page)) {
f2fs_put_page(page, 1);
break; break;
}
if (!is_fsync_dnode(page)) if (!is_fsync_dnode(page))
goto next; goto next;
@ -330,8 +332,10 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,
if (!check_only && if (!check_only &&
IS_INODE(page) && is_dent_dnode(page)) { IS_INODE(page) && is_dent_dnode(page)) {
err = f2fs_recover_inode_page(sbi, page); err = f2fs_recover_inode_page(sbi, page);
if (err) if (err) {
f2fs_put_page(page, 1);
break; break;
}
quota_inode = true; quota_inode = true;
} }
@ -347,6 +351,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,
err = 0; err = 0;
goto next; goto next;
} }
f2fs_put_page(page, 1);
break; break;
} }
} }
@ -362,6 +367,7 @@ next:
"%s: detect looped node chain, " "%s: detect looped node chain, "
"blkaddr:%u, next:%u", "blkaddr:%u, next:%u",
__func__, blkaddr, next_blkaddr_of_node(page)); __func__, blkaddr, next_blkaddr_of_node(page));
f2fs_put_page(page, 1);
err = -EINVAL; err = -EINVAL;
break; break;
} }
@ -372,7 +378,6 @@ next:
f2fs_ra_meta_pages_cond(sbi, blkaddr); f2fs_ra_meta_pages_cond(sbi, blkaddr);
} }
f2fs_put_page(page, 1);
return err; return err;
} }
@ -658,8 +663,10 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,
*/ */
if (IS_INODE(page)) { if (IS_INODE(page)) {
err = recover_inode(entry->inode, page); err = recover_inode(entry->inode, page);
if (err) if (err) {
f2fs_put_page(page, 1);
break; break;
}
} }
if (entry->last_dentry == blkaddr) { if (entry->last_dentry == blkaddr) {
err = recover_dentry(entry->inode, page, dir_list); err = recover_dentry(entry->inode, page, dir_list);