Skip to content

Commit

Permalink
ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_g…
Browse files Browse the repository at this point in the history
…roup_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]>
Cc: Mark Fasheh <[email protected]>
Acked-by: Joel Becker <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Younger Liu authored and torvalds committed Nov 13, 2013
1 parent eedd40e commit 8abaae8
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions fs/ocfs2/resize.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 8abaae8

Please sign in to comment.