diff --git a/[refs] b/[refs]
index 7be160626c74..189a8a85573b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81a4e320e6ee29bde3fe880ab87b2122bc1de88b
+refs/heads/master: 2a0e33889b3f5e3c270dd1b746f4c0a75efa4790
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index e56117651826..ac1840415a65 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/journal.c
@@ -952,6 +952,8 @@ int journal_create(journal_t *journal)
 		if (err)
 			return err;
 		bh = __getblk(journal->j_dev, blocknr, journal->j_blocksize);
+		if (unlikely(!bh))
+			return -ENOMEM;
 		lock_buffer(bh);
 		memset (bh->b_data, 0, journal->j_blocksize);
 		BUFFER_TRACE(bh, "marking dirty");