ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add()
PATCH 2/2 ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add()
If group_bh is not initialized, there is no need to release. This problem does not cause anything wrong, but the patch would make the code more logical.
Signed-off-by Younger Liu <[email protected]>
--- fs/ocfs2/resize.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
fs/ocfs2/resize.c +6 -3
@@ -514,7 +514,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input) ret =ocfs2_verify_group_and_input (main_bm_inode, fe, input, group_bh);if (ret) {mlog_errno (ret); - goto out_unlock; + goto out_free_group_bh; } trace_ocfs2_group_add((unsigned long long)input->group,
@@ -524,7 +524,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)if (IS_ERR (handle)) {mlog_errno (PTR_ERR (handle)); ret = -EINVAL ; - goto out_unlock; + goto out_free_group_bh; } cl_bpc =le16_to_cpu (fe->id2.i_chain.cl_bpc);
@@ -577,8 +577,11 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input) out_commit:ocfs2_commit_trans (osb, handle); -out_unlock: + +out_free_group_bh:brelse (group_bh); + +out_unlock:brelse (main_bm_bh);ocfs2_inode_unlock (main_bm_inode,1 );
Signature · 1 line
1.7.9.7
Joel Becker
maintainerPATCH 2/2 ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add()
Acked-by Joel Becker <[email protected]>
Quoted 52 lines · Younger Liu
If
group_bhis not initialized, there is no need to release. This problem does not cause anything wrong, but the patch would make the code more logical.Signed-off-by Younger Liu <[email protected]>--- fs/ocfs2/resize.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)fs/ocfs2/resize.c +6
-3@@ -514,7 +514,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input) ret =ocfs2_verify_group_and_input (main_bm_inode, fe, input, group_bh);if (ret) {mlog_errno (ret); - goto out_unlock; + goto out_free_group_bh; } trace_ocfs2_group_add((unsigned long long)input->group,@@ -524,7 +524,7 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)if (IS_ERR (handle)) {mlog_errno (PTR_ERR (handle)); ret = -EINVAL ; - goto out_unlock; + goto out_free_group_bh; } cl_bpc =le16_to_cpu (fe->id2.i_chain.cl_bpc);@@ -577,8 +577,11 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input) out_commit:ocfs2_commit_trans (osb, handle); -out_unlock: + +out_free_group_bh:brelse (group_bh); + +out_unlock:brelse (main_bm_bh);ocfs2_inode_unlock (main_bm_inode,1 );Signature · 7 lines
1.7.9.7 _______________________________________________ Ocfs2-devel mailing list Ocfs2-devel at oss.oracle.com https://oss.oracle.com/mailman/listinfo/ocfs2-devel
Signature · 5 lines
"The first thing we do, let's kill all the lawyers."
-Henry VI, IV:ii
http://www.jlbec.org/
jlbec at evilplan.org