From: Joel Becker <jlbec@evilplan.org>
To: ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 2/2] ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add()
Date: Fri, 27 Sep 2013 12:06:28 -0700 [thread overview]
Message-ID: <20130927190628.GI26517@localhost> (raw)
In-Reply-To: <523ECBD4.1000403@huawei.com>
Acked-by: Joel Becker <jlbec@evilplan.org>
On Sun, Sep 22, 2013 at 06:52:04PM +0800, Younger Liu wrote:
> 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>
> ---
> fs/ocfs2/resize.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
> index 376750f..822ebc1 100644
> --- a/fs/ocfs2/resize.c
> +++ b/fs/ocfs2/resize.c
> @@ -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);
> --
> 1.7.9.7
>
>
> _______________________________________________
> Ocfs2-devel mailing list
> Ocfs2-devel at oss.oracle.com
> https://oss.oracle.com/mailman/listinfo/ocfs2-devel
--
"The first thing we do, let's kill all the lawyers."
-Henry VI, IV:ii
http://www.jlbec.org/
jlbec at evilplan.org
prev parent reply other threads:[~2013-09-27 19:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-22 10:52 [Ocfs2-devel] [PATCH 2/2] ocfs2: do not call brelse() if group_bh is not initialized in ocfs2_group_add() Younger Liu
2013-09-27 19:06 ` Joel Becker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130927190628.GI26517@localhost \
--to=jlbec@evilplan.org \
--cc=ocfs2-devel@oss.oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox