---

yaml --- r: 229105 b: refs/heads/master c: b7271b0 h: refs/heads/master i: 229103: e87700b v: v3
git-mirror · Dec 18, 2010 · b9c3436 · b9c3436
1 parent 92486aa
commit b9c3436
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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: