---

yaml --- r: 107537 b: refs/heads/master c: d5a0d4f h: refs/heads/master i: 107535: ab13dc5 v: v3
git-mirror · Aug 2, 2008 · 4cfc647 · 4cfc647
1 parent 47f8728
commit 4cfc647
Show file tree

Hide file tree

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