|
@@ -81,8 +81,10 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
|
|
|
|
|
|
f2fs_lock_op(sbi);
|
|
f2fs_lock_op(sbi);
|
|
ipage = get_node_page(sbi, inode->i_ino);
|
|
ipage = get_node_page(sbi, inode->i_ino);
|
|
- if (IS_ERR(ipage))
|
|
|
|
- return PTR_ERR(ipage);
|
|
|
|
|
|
+ if (IS_ERR(ipage)) {
|
|
|
|
+ err = PTR_ERR(ipage);
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
/*
|
|
* i_addr[0] is not used for inline data,
|
|
* i_addr[0] is not used for inline data,
|
|
@@ -90,10 +92,8 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
|
|
*/
|
|
*/
|
|
set_new_dnode(&dn, inode, ipage, NULL, 0);
|
|
set_new_dnode(&dn, inode, ipage, NULL, 0);
|
|
err = f2fs_reserve_block(&dn, 0);
|
|
err = f2fs_reserve_block(&dn, 0);
|
|
- if (err) {
|
|
|
|
- f2fs_unlock_op(sbi);
|
|
|
|
- return err;
|
|
|
|
- }
|
|
|
|
|
|
+ if (err)
|
|
|
|
+ goto out;
|
|
|
|
|
|
zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
|
|
zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
|
|
|
|
|
|
@@ -118,6 +118,7 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
|
|
|
|
|
|
sync_inode_page(&dn);
|
|
sync_inode_page(&dn);
|
|
f2fs_put_dnode(&dn);
|
|
f2fs_put_dnode(&dn);
|
|
|
|
+out:
|
|
f2fs_unlock_op(sbi);
|
|
f2fs_unlock_op(sbi);
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|