From: Mark Fasheh <mfasheh@suse.de>
Date: Fri, 9 Sep 2011 00:40:01 +0000 (-0700)
Subject: btrfs: Remove BUG_ON from __finish_chunk_alloc()
X-Git-Tag: Ubuntu-5.2.0-15.16~18371^2~13^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3acd395317f22b4346a139571cd4723408c5d4af;p=mirror_ubuntu-eoan-kernel.git

btrfs: Remove BUG_ON from __finish_chunk_alloc()

btrfs_alloc_chunk() unconditionally BUGs on any error returned from
__finish_chunk_alloc() so there's no need for two BUG_ON lines. Remove the
one from __finish_chunk_alloc().

Signed-off-by: Mark Fasheh <mfasheh@suse.de>
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f002973959d0..394bf15ea18c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3383,7 +3383,8 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans,
 		device = map->stripes[index].dev;
 		device->bytes_used += stripe_size;
 		ret = btrfs_update_device(trans, device);
-		BUG_ON(ret);
+		if (ret)
+			goto out_free;
 		index++;
 	}
 
@@ -3430,6 +3431,7 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans,
 					     item_size);
 	}
 
+out_free:
 	kfree(chunk);
 	return ret;
 }