Skip to content

Commit

Permalink
btrfs: don't BUG_ON allocation errors in btrfs_drop_snapshot
Browse files Browse the repository at this point in the history
In addition to properly handling allocation failure from btrfs_alloc_path, I
also fixed up the kzalloc error handling code immediately below it.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
  • Loading branch information
Mark Fasheh committed Jul 25, 2011
1 parent 92b8e89 commit 38a1a91
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 38a1a91

Please sign in to comment.