2010-10-04 05:50:04

by Namhyung Kim

Subject: [PATCH] jbd: Simplify return path of journal_init_common()

Signed-off-by: Namhyung Kim <[email protected]>
---
fs/jbd/journal.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index 2c4b1f1..6f20a75 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -698,7 +698,7 @@ static journal_t * journal_init_common (void)

journal = kzalloc(sizeof(*journal), GFP_KERNEL);
if (!journal)
- goto fail;
+ goto out;

init_waitqueue_head(&journal->j_wait_transaction_locked);
init_waitqueue_head(&journal->j_wait_logspace);
@@ -721,11 +721,10 @@ static journal_t * journal_init_common (void)
err = journal_init_revoke(journal, JOURNAL_REVOKE_DEFAULT_HASH);
if (err) {
kfree(journal);
- goto fail;
+ journal = NULL;
}
+out:
return journal;
-fail:
- return NULL;
}

/* journal_init_dev and journal_init_inode:
--
1.7.0.4

2010-10-04 09:48:41

by Jan Kara

Subject: Re: [PATCH] jbd: Simplify return path of journal_init_common()

On Mon 04-10-10 14:49:58, Namhyung Kim wrote:
> Signed-off-by: Namhyung Kim <[email protected]>
> ---
> fs/jbd/journal.c | 7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
> index 2c4b1f1..6f20a75 100644
> --- a/fs/jbd/journal.c
> +++ b/fs/jbd/journal.c
> @@ -698,7 +698,7 @@ static journal_t * journal_init_common (void)
>
> journal = kzalloc(sizeof(*journal), GFP_KERNEL);
> if (!journal)
> - goto fail;
> + goto out;
>
> init_waitqueue_head(&journal->j_wait_transaction_locked);
> init_waitqueue_head(&journal->j_wait_logspace);
> @@ -721,11 +721,10 @@ static journal_t * journal_init_common (void)
> err = journal_init_revoke(journal, JOURNAL_REVOKE_DEFAULT_HASH);
> if (err) {
> kfree(journal);
> - goto fail;
> + journal = NULL;
> }
> +out:
> return journal;
> -fail:
> - return NULL;
If you want to do something like this (but frankly I'm not so convinced
that the cleanup is worth the code churn), then just do directly
"return NULL". The function is simple enough... Thanks.

Honza
--
Jan Kara <[email protected]>
SUSE Labs, CR