2012-05-03 14:13:04

by Julia Lawall

[permalink] [raw]
Subject: [PATCH] fs/reiserfs/journal.c: add missing brelse

From: Julia Lawall <[email protected]>

Brelse is called to put bhjh on every way out of the function except this one.

Signed-off-by: Julia Lawall <[email protected]>

---
fs/reiserfs/journal.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index b1a0857..1ef9cbc 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -2757,8 +2757,10 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
le32_to_cpu(jh->jh_journal.jp_journal_max_commit_age);
journal->j_max_trans_age = JOURNAL_MAX_TRANS_AGE;

- if (check_advise_trans_params(sb, journal) != 0)
+ if (check_advise_trans_params(sb, journal) != 0) {
+ brelse(bhjh);
goto free_and_return;
+ }
journal->j_default_max_commit_age = journal->j_max_commit_age;

if (commit_max_age != 0) {


2012-05-03 14:45:45

by Edward Shishkin

[permalink] [raw]
Subject: Re: [PATCH] fs/reiserfs/journal.c: add missing brelse

On 05/03/2012 04:12 PM, Julia Lawall wrote:
> From: Julia Lawall<[email protected]>
>
> Brelse is called to put bhjh on every way out of the function except this one.

Yes, thanks.
Acked-by: Edward Shishkin <[email protected]>

>
> Signed-off-by: Julia Lawall<[email protected]>
>
> ---
> fs/reiserfs/journal.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
> index b1a0857..1ef9cbc 100644
> --- a/fs/reiserfs/journal.c
> +++ b/fs/reiserfs/journal.c
> @@ -2757,8 +2757,10 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
> le32_to_cpu(jh->jh_journal.jp_journal_max_commit_age);
> journal->j_max_trans_age = JOURNAL_MAX_TRANS_AGE;
>
> - if (check_advise_trans_params(sb, journal) != 0)
> + if (check_advise_trans_params(sb, journal) != 0) {
> + brelse(bhjh);
> goto free_and_return;
> + }
> journal->j_default_max_commit_age = journal->j_max_commit_age;
>
> if (commit_max_age != 0) {
>
> --
> To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html