From d985892a5776cf055b0b51cd883f00dbb38807fe Mon Sep 17 00:00:00 2001
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Date: Sat, 12 Jan 2013 01:22:33 -0800
Subject: [PATCH] --- yaml --- r: 359014 b: refs/heads/master c:
 61f43e6880dee5983999fe40bf96c1cf43740b4c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bfb35ebd8df5..bde6937a012d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d8759eb488f9e88fa5f976c4fd7ed205661c872
+refs/heads/master: 61f43e6880dee5983999fe40bf96c1cf43740b4c
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index b176d4253544..6e4f8a529fbc 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -676,6 +676,10 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
 		 * parent to disk.
 		 */
 		bh = sb_getblk(inode->i_sb, new_blocks[n-1]);
+		if (unlikely(!bh)) {
+			err = -ENOMEM;
+			goto failed;
+		}
 		branch[n].bh = bh;
 		lock_buffer(bh);
 		BUFFER_TRACE(bh, "call get_create_access");
@@ -717,7 +721,7 @@ static int ext3_alloc_branch(handle_t *handle, struct inode *inode,
 		BUFFER_TRACE(branch[i].bh, "call journal_forget");
 		ext3_journal_forget(handle, branch[i].bh);
 	}
-	for (i = 0; i <indirect_blks; i++)
+	for (i = 0; i < indirect_blks; i++)
 		ext3_free_blocks(handle, inode, new_blocks[i], 1);
 
 	ext3_free_blocks(handle, inode, new_blocks[i], num);