From a31aae8100853ffbb700b22ac8cba197ca91f15a Mon Sep 17 00:00:00 2001
From: Zach Brown <zab@redhat.com>
Date: Tue, 8 Jan 2013 19:37:58 +0000
Subject: [PATCH] --- yaml --- r: 349166 b: refs/heads/master c:
 f276795627045a3c599a60b476767861e4318c7d h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/inode.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 770dc919bf5e..c81a179f0152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9e4fb53938de5db01950c9dfe479703b2f5c964
+refs/heads/master: f276795627045a3c599a60b476767861e4318c7d
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
index ac98384b174e..3d2c64d4734a 100644
--- a/trunk/fs/btrfs/inode.c
+++ b/trunk/fs/btrfs/inode.c
@@ -3677,6 +3677,7 @@ int btrfs_cont_expand(struct inode *inode, loff_t oldsize, loff_t size)
 				block_end - cur_offset, 0);
 		if (IS_ERR(em)) {
 			err = PTR_ERR(em);
+			em = NULL;
 			break;
 		}
 		last_byte = min(extent_map_end(em), block_end);