commit db5b493ac78e46c7b6bad22cd25d8041564cd8ea
author Tsutomu Itoh <t-itoh@jp.fujitsu.com> Wed Mar 23 08:14:16 2011 +0000
committer root <Chris Mason chris.mason@oracle.com> Mon Mar 28 05:37:35 2011 -0400
tree 18f484c3d8194b80165e5400831931a3ac5c58ba
parent 1abe9b8a138c9988ba8f7bfded6453649a31541f

Btrfs: cleanup some BUG_ON()

This patch changes some BUG_ON() to the error return.
(but, most callers still use BUG_ON())

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 9f31e11..00cbb41 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1248,7 +1248,10 @@
 		     root, fs_info, location->objectid);
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path) {
+		kfree(root);
+		return ERR_PTR(-ENOMEM);
+	}
 	ret = btrfs_search_slot(NULL, tree_root, location, path, 0, 0);
 	if (ret == 0) {
 		l = path->nodes[0];