Commit e1a12670 authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik

Btrfs: free all recorded tree blocks on error

We've missed the 'free blocks' part on ENOMEM error.
Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent aca1bba6
...@@ -2848,8 +2848,10 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, ...@@ -2848,8 +2848,10 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
int err = 0; int err = 0;
path = btrfs_alloc_path(); path = btrfs_alloc_path();
if (!path) if (!path) {
return -ENOMEM; err = -ENOMEM;
goto out_path;
}
rb_node = rb_first(blocks); rb_node = rb_first(blocks);
while (rb_node) { while (rb_node) {
...@@ -2888,10 +2890,11 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, ...@@ -2888,10 +2890,11 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans,
rb_node = rb_next(rb_node); rb_node = rb_next(rb_node);
} }
out: out:
free_block_list(blocks);
err = finish_pending_nodes(trans, rc, path, err); err = finish_pending_nodes(trans, rc, path, err);
btrfs_free_path(path); btrfs_free_path(path);
out_path:
free_block_list(blocks);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment