aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2014-04-16 01:22:50 -0400
committerJaegeuk Kim <jaegeuk.kim@samsung.com>2014-05-06 21:21:54 -0400
commit15c6e3aae68d6167cba063387a59968f811c8268 (patch)
tree4a28d9b58e4ccfaaabd1cd5076c1752facd8639e
parent76f60268e70a700c04c85e1b0d520c94062a40a2 (diff)
f2fs: fix to unlock f2fs_lock at the omitted error case
If it occurs an error, we should call f2fs_unlock_op. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
-rw-r--r--fs/f2fs/inline.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 383db1fabcf4..3258c7cf00d5 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -81,8 +81,10 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
81 81
82 f2fs_lock_op(sbi); 82 f2fs_lock_op(sbi);
83 ipage = get_node_page(sbi, inode->i_ino); 83 ipage = get_node_page(sbi, inode->i_ino);
84 if (IS_ERR(ipage)) 84 if (IS_ERR(ipage)) {
85 return PTR_ERR(ipage); 85 err = PTR_ERR(ipage);
86 goto out;
87 }
86 88
87 /* 89 /*
88 * i_addr[0] is not used for inline data, 90 * 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)
90 */ 92 */
91 set_new_dnode(&dn, inode, ipage, NULL, 0); 93 set_new_dnode(&dn, inode, ipage, NULL, 0);
92 err = f2fs_reserve_block(&dn, 0); 94 err = f2fs_reserve_block(&dn, 0);
93 if (err) { 95 if (err)
94 f2fs_unlock_op(sbi); 96 goto out;
95 return err;
96 }
97 97
98 zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE); 98 zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
99 99
@@ -118,6 +118,7 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)
118 118
119 sync_inode_page(&dn); 119 sync_inode_page(&dn);
120 f2fs_put_dnode(&dn); 120 f2fs_put_dnode(&dn);
121out:
121 f2fs_unlock_op(sbi); 122 f2fs_unlock_op(sbi);
122 return err; 123 return err;
123} 124}