btrfs: Remove BUG_ON from __finish_chunk_alloc()

Mark Fasheh · kdave · commit 3acd395317f2 · 2012-03-22T01:45:39.000+01:00
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 &lt;mfasheh@suse.de&gt;
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -3383,7 +3383,8 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans,`
`3383`	`3383`	`device = map->stripes[index].dev;`
`3384`	`3384`	`device->bytes_used += stripe_size;`
`3385`	`3385`	`ret = btrfs_update_device(trans, device);`
`3386`		`- BUG_ON(ret);`
	`3386`	`+ if (ret)`
	`3387`	`+ goto out_free;`
`3387`	`3388`	`index++;`
`3388`	`3389`	`}`
`3389`	`3390`
`@@ -3430,6 +3431,7 @@ static int __finish_chunk_alloc(struct btrfs_trans_handle *trans,`
`3430`	`3431`	`item_size);`
`3431`	`3432`	`}`
`3432`	`3433`
	`3434`	`+out_free:`
`3433`	`3435`	`kfree(chunk);`
`3434`	`3436`	`return ret;`
`3435`	`3437`	`}`