From 3ce743605368362058712cc0d503be72c2efd5fc Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Fri, 8 Mar 2013 15:41:02 -0500
Subject: [PATCH] --- yaml --- r: 361355 b: refs/heads/master c:
 492104c866cb1b62a11393adccb477f5cd2c7768 h: refs/heads/master i:   361353:
 a5a44e3342e8e32c7210d4bf21249c4f225ac460   361351:
 d3765ef9d845f54588f14ff41919862746281bf7 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/btrfs/extent-tree.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 46dec2479f1b..b0bbc6bb5937 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc178622d40d87e75abc131007342429c9b03351
+refs/heads/master: 492104c866cb1b62a11393adccb477f5cd2c7768
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index aaee2b7fee78..350b9b18140c 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -1467,8 +1467,11 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans,
 	if (ret && !insert) {
 		err = -ENOENT;
 		goto out;
+	} else if (ret) {
+		err = -EIO;
+		WARN_ON(1);
+		goto out;
 	}
-	BUG_ON(ret); /* Corruption */
 
 	leaf = path->nodes[0];
 	item_size = btrfs_item_size_nr(leaf, path->slots[0]);