From 4cfc64765de58622ce9073fa97b5d5bd0c78e4b7 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Sat, 2 Aug 2008 18:51:06 -0400
Subject: [PATCH] --- yaml --- r: 107537 b: refs/heads/master c:
 d5a0d4f732af3438e592efab4cb80076d1dd81b5 h: refs/heads/master i:   107535:
 ab13dc56cbf5b142b56eb8f81f909afc1332a847 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/inode.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e707387c96bf..a8af575ba8ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9e34f4e8f42177c66754fec1edfd35e70c18f99
+refs/heads/master: d5a0d4f732af3438e592efab4cb80076d1dd81b5
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index efe8caa3811c..37f834bc7cd6 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2280,8 +2280,11 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
 	}
 
 	page = __grab_cache_page(mapping, index);
-	if (!page)
-		return -ENOMEM;
+	if (!page) {
+		ext4_journal_stop(handle);
+		ret = -ENOMEM;
+		goto out;
+	}
 	*pagep = page;
 
 	ret = block_write_begin(file, mapping, pos, len, flags, pagep, fsdata,