From b9c34361edda5535a8709ab0c572c4d0b19091f7 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 18 Dec 2010 13:39:38 -0500
Subject: [PATCH] --- yaml --- r: 229105 b: refs/heads/master c:
 b7271b0a39947f757d7969f6150dcb16c1976b91 h: refs/heads/master i:   229103:
 e87700be7e28cbfc5dfc73d24b4350975421e5dc v: v3

---
 [refs]                  | 2 +-
 trunk/fs/jbd2/journal.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8f66d5f6b8e3..4acdce890ff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4f6271b68b9693290963b97b320d2e6e6f3446
+refs/heads/master: b7271b0a39947f757d7969f6150dcb16c1976b91
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
index 06dfd778cae5..2447bd86f801 100644
--- a/trunk/fs/jbd2/journal.c
+++ b/trunk/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: