Commit d54c795b authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix error path when fail to read inline data

We should unlock page in ->readpage() path and also should unlock & release page
in error path of ->write_begin() to avoid deadlock or memory leak.
So let's add release code to fix the problem when we fail to read inline data.
Signed-off-by: default avatarChao Yu <>
Signed-off-by: default avatarJaegeuk Kim <>
parent 2d7b822a
......@@ -942,13 +942,19 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
if (dn.data_blkaddr == NEW_ADDR) {
zero_user_segment(page, 0, PAGE_CACHE_SIZE);
} else {
if (f2fs_has_inline_data(inode))
if (f2fs_has_inline_data(inode)) {
err = f2fs_read_inline_data(inode, page);
if (err) {
return err;
} else {
err = f2fs_submit_page_bio(sbi, page, dn.data_blkaddr,
if (err)
return err;
if (err)
return err;
if (unlikely(!PageUptodate(page))) {
f2fs_put_page(page, 1);
......@@ -45,8 +45,10 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
ipage = get_node_page(sbi, inode->i_ino);
if (IS_ERR(ipage))
if (IS_ERR(ipage)) {
return PTR_ERR(ipage);
zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment