From d96ff3f87f29437c6e93c450e90fa2f4b9ea9af2 Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Sun, 11 Sep 2011 10:52:24 -0400
Subject: [PATCH] --- yaml --- r: 263735 b: refs/heads/master c:
 5b397377e97d436fc2ed872fc53f85395bb984e0 h: refs/heads/master i:   263733:
 3823e17e50a5e261a9967c55e0c6b5d8baa1c5cc   263731:
 7b27dea4ed9f3f202eb3fc90871da11594e94be0   263727:
 691f2398561df904f4f783f8a2ec5d7b9a80be16 v: v3

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

diff --git a/[refs] b/[refs]
index a9565c4028ae..1001c2a3600e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98c9942aca05fff198cd5ca629599cd193444809
+refs/heads/master: 5b397377e97d436fc2ed872fc53f85395bb984e0
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index edd45f709989..c257af2ce9cb 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -3510,15 +3510,19 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
 			err = btrfs_drop_extents(trans, inode, cur_offset,
 						 cur_offset + hole_size,
 						 &hint_byte, 1);
-			if (err)
+			if (err) {
+				btrfs_end_transaction(trans, root);
 				break;
+			}
 
 			err = btrfs_insert_file_extent(trans, root,
 					btrfs_ino(inode), cur_offset, 0,
 					0, hole_size, 0, hole_size,
 					0, 0, 0);
-			if (err)
+			if (err) {
+				btrfs_end_transaction(trans, root);
 				break;
+			}
 
 			btrfs_drop_extent_cache(inode, hole_start,
 					last_byte - 1, 0);