diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2013-03-04 17:25:38 +0100 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2013-03-04 22:33:23 +0100 |
| commit | e1a1267054ea9dcafd01636e52d441f809efad5e (patch) | |
| tree | 81c66abefae5b7c65d30a9535c73425da3375fde /fs | |
| parent | Btrfs: build up error handling for merge_reloc_roots (diff) | |
| download | linux-e1a1267054ea9dcafd01636e52d441f809efad5e.tar.xz linux-e1a1267054ea9dcafd01636e52d441f809efad5e.zip | |
Btrfs: free all recorded tree blocks on error
We've missed the 'free blocks' part on ENOMEM error.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/relocation.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 0f001c14eaf4..7d1654cf9d48 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2848,8 +2848,10 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, int err = 0; path = btrfs_alloc_path(); - if (!path) - return -ENOMEM; + if (!path) { + err = -ENOMEM; + goto out_path; + } rb_node = rb_first(blocks); while (rb_node) { @@ -2888,10 +2890,11 @@ int relocate_tree_blocks(struct btrfs_trans_handle *trans, rb_node = rb_next(rb_node); } out: - free_block_list(blocks); err = finish_pending_nodes(trans, rc, path, err); btrfs_free_path(path); +out_path: + free_block_list(blocks); return err; } |