From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 18 Dec 2010 18:39:38 +0000 (-0500)
Subject: jbd2: simplify return path of journal_init_common
X-Git-Tag: v2.6.38-rc1~409^2~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b7271b0a39947f757d7969f6150dcb16c1976b91;p=~emulex%2Finfiniband.git

jbd2: simplify return path of journal_init_common

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 06dfd778cae..2447bd86f80 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -828,7 +828,7 @@ static journal_t * journal_init_common (void)
 
 	journal = kzalloc(sizeof(*journal), GFP_KERNEL);
 	if (!journal)
-		goto fail;
+		return NULL;
 
 	init_waitqueue_head(&journal->j_wait_transaction_locked);
 	init_waitqueue_head(&journal->j_wait_logspace);
@@ -853,14 +853,12 @@ static journal_t * journal_init_common (void)
 	err = jbd2_journal_init_revoke(journal, JOURNAL_REVOKE_DEFAULT_HASH);
 	if (err) {
 		kfree(journal);
-		goto fail;
+		return NULL;
 	}
 
 	spin_lock_init(&journal->j_history_lock);
 
 	return journal;
-fail:
-	return NULL;
 }
 
 /* jbd2_journal_init_dev and jbd2_journal_init_inode: