ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add()
authorYounger Liu <younger.liu@huawei.com>
Tue, 12 Nov 2013 23:07:04 +0000 (15:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:01 +0000 (12:09 +0900)
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 <younger.liu@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/resize.c

index 376750f7883ea4f47a0ec0cf410cacd4ea5e3d2e..822ebc10f281057d9c6f5adc01c246042ef01cfd 100644 (file)
@@ -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);