From 0ea64888d1d50009f260576bac887939e9397d3e Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mfasheh@suse.com>
Date: Wed, 13 Jul 2011 10:59:59 -0700
Subject: [PATCH] --- yaml --- r: 262229 b: refs/heads/master c:
 38a1a919535742af677303271eb4ff731547b706 h: refs/heads/master i:   262227:
 6ca17177ce46d6ea7bc4c4e95bf6eaf2bd5a41bd v: v3

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

diff --git a/[refs] b/[refs]
index 050fedf4c87a..a7b66d687bcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b8e897f6e7ba4aa10037ebd8186f85d39330d0
+refs/heads/master: 38a1a919535742af677303271eb4ff731547b706
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
index f6af4236e59b..6bce721e7bbc 100644
--- a/trunk/fs/btrfs/extent-tree.c
+++ b/trunk/fs/btrfs/extent-tree.c
@@ -6272,10 +6272,14 @@ int btrfs_drop_snapshot(struct btrfs_root *root,
 	int level;
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path)
+		return -ENOMEM;
 
 	wc = kzalloc(sizeof(*wc), GFP_NOFS);
-	BUG_ON(!wc);
+	if (!wc) {
+		btrfs_free_path(path);
+		return -ENOMEM;
+	}
 
 	trans = btrfs_start_transaction(tree_root, 0);
 	BUG_ON(IS_ERR(trans));