[2/3] Btrfs: return ENOMEM rather than use BUG_ON when btrfs_alloc_path fails

Commit Message

Wang Shilong Feb. 27, 2013, 11:20 a.m. UTC

From: Wang Shilong <[e-mail]>

Return ENOMEM rather trigger BUG_ON, fix it.

Signed-off-by: Wang Shilong <[e-mail]>
Reviewed-by: Miao Xie <[e-mail]>
---
 fs/btrfs/qgroup.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

Comments

Zach Brown Feb. 27, 2013, 9:31 p.m. UTC | #1

> Return ENOMEM rather trigger BUG_ON, fix it.

These changes look good.  The resulting surrounding state buildup and
cleanup paths look correct.

Thanks for helping remove a few more BUG_ON()s :).

Reviewed-by: Zach Brown <[e-mail]>

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index f011d9b..69fa487 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -620,7 +620,9 @@  static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,
 	key.offset = qgroupid;
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path)
+		return -ENOMEM;
+
 	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
 	if (ret > 0)
 		ret = -ENOENT;
@@ -661,7 +663,9 @@  static int update_qgroup_info_item(struct btrfs_trans_handle *trans,
 	key.offset = qgroup->qgroupid;
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path)
+		return -ENOMEM;
+
 	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
 	if (ret > 0)
 		ret = -ENOENT;
@@ -702,7 +706,9 @@  static int update_qgroup_status_item(struct btrfs_trans_handle *trans,
 	key.offset = 0;
 
 	path = btrfs_alloc_path();
-	BUG_ON(!path);
+	if (!path)
+		return -ENOMEM;
+
 	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
 	if (ret > 0)
 		ret = -ENOENT;