From cc97740bad23010a612a38f6d81d0294a2d643f9 Mon Sep 17 00:00:00 2001
From: Josef Bacik <jbacik@fusionio.com>
Date: Fri, 19 Apr 2013 23:45:33 -0400
Subject: [PATCH] --- yaml --- r: 374888 b: refs/heads/master c:
 9bb91873e32af6305a1c5239024674e4a5a97e92 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/fs/btrfs/volumes.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f2fd9d592748..8d23dd9eff79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4c7ca86b59400cdab645b9a974a6ca4ec2f9f62
+refs/heads/master: 9bb91873e32af6305a1c5239024674e4a5a97e92
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index 76ded9eb77a7..c8a315d4b86f 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -4406,10 +4406,16 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
 		btrfs_crit(fs_info, "unable to find logical %llu len %llu",
 			(unsigned long long)logical,
 			(unsigned long long)*length);
-		BUG();
+		return -EINVAL;
+	}
+
+	if (em->start > logical || em->start + em->len < logical) {
+		btrfs_crit(fs_info, "found a bad mapping, wanted %Lu, "
+			   "found %Lu-%Lu\n", logical, em->start,
+			   em->start + em->len);
+		return -EINVAL;
 	}
 
-	BUG_ON(em->start > logical || em->start + em->len < logical);
 	map = (struct map_lookup *)em->bdev;
 	offset = logical - em->start;