From 8fb802eab273f5ef9401060c23a5dedb817b14fc Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 1 Dec 2009 09:04:42 -0500
Subject: [PATCH] --- yaml --- r: 174394 b: refs/heads/master c:
 e6ec116b67f46e0e7808276476554727b2e6240b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/jbd2/commit.c  | 4 ++++
 trunk/fs/jbd2/journal.c | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e71f6c49ed3e..7bea4c960b67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0ca309858ee186435c608ee9eaafd1c8dcb53a
+refs/heads/master: e6ec116b67f46e0e7808276476554727b2e6240b
diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c
index d4cfd6d2779e..8896c1d4febe 100644
--- a/trunk/fs/jbd2/commit.c
+++ b/trunk/fs/jbd2/commit.c
@@ -636,6 +636,10 @@ void jbd2_journal_commit_transaction(journal_t *journal)
 		JBUFFER_TRACE(jh, "ph3: write metadata");
 		flags = jbd2_journal_write_metadata_buffer(commit_transaction,
 						      jh, &new_jh, blocknr);
+		if (flags < 0) {
+			jbd2_journal_abort(journal, flags);
+			continue;
+		}
 		set_bit(BH_JWrite, &jh2bh(new_jh)->b_state);
 		wbuf[bufs++] = jh2bh(new_jh);
 
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
index af60d98ddd22..3f473faa4660 100644
--- a/trunk/fs/jbd2/journal.c
+++ b/trunk/fs/jbd2/journal.c
@@ -358,6 +358,10 @@ int jbd2_journal_write_metadata_buffer(transaction_t *transaction,
 
 		jbd_unlock_bh_state(bh_in);
 		tmp = jbd2_alloc(bh_in->b_size, GFP_NOFS);
+		if (!tmp) {
+			jbd2_journal_put_journal_head(new_jh);
+			return -ENOMEM;
+		}
 		jbd_lock_bh_state(bh_in);
 		if (jh_in->b_frozen_data) {
 			jbd2_free(tmp, bh_in->b_size);