btrfs: free the reloc_control in a consistent way
[ Upstream commit 1a0afa0ecf
]
If we have an error while processing the reloc roots we could leak roots
that were added to rc->reloc_roots before we hit the error. We could
have also not removed the reloc tree mapping from our rb_tree, so clean
up any remaining nodes in the reloc root rb_tree.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ use rbtree_postorder_for_each_entry_safe ]
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
parent
c88596d593
commit
5dc170aee1
|
@ -4354,6 +4354,18 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void free_reloc_control(struct reloc_control *rc)
|
||||||
|
{
|
||||||
|
struct mapping_node *node, *tmp;
|
||||||
|
|
||||||
|
free_reloc_roots(&rc->reloc_roots);
|
||||||
|
rbtree_postorder_for_each_entry_safe(node, tmp,
|
||||||
|
&rc->reloc_root_tree.rb_root, rb_node)
|
||||||
|
kfree(node);
|
||||||
|
|
||||||
|
kfree(rc);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Print the block group being relocated
|
* Print the block group being relocated
|
||||||
*/
|
*/
|
||||||
|
@ -4486,7 +4498,7 @@ out:
|
||||||
btrfs_dec_block_group_ro(rc->block_group);
|
btrfs_dec_block_group_ro(rc->block_group);
|
||||||
iput(rc->data_inode);
|
iput(rc->data_inode);
|
||||||
btrfs_put_block_group(rc->block_group);
|
btrfs_put_block_group(rc->block_group);
|
||||||
kfree(rc);
|
free_reloc_control(rc);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4659,7 +4671,7 @@ out_clean:
|
||||||
err = ret;
|
err = ret;
|
||||||
out_unset:
|
out_unset:
|
||||||
unset_reloc_control(rc);
|
unset_reloc_control(rc);
|
||||||
kfree(rc);
|
free_reloc_control(rc);
|
||||||
out:
|
out:
|
||||||
if (!list_empty(&reloc_roots))
|
if (!list_empty(&reloc_roots))
|
||||||
free_reloc_roots(&reloc_roots);
|
free_reloc_roots(&reloc_roots);
|
||||||
|
|
Loading…
Reference in New Issue