summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/relocation.c
diff options
context:
space:
mode:
authorJosef Bacik2016-09-02 21:25:43 +0200
committerDavid Sterba2016-09-26 18:08:44 +0200
commit6bdf131fac2336adb1a628f992ba32384f653a55 (patch)
tree1fa2a56a821b5b40a704e535c8c37734a39354a2 /fs/btrfs/relocation.c
parentbtrfs: squash lines for simple wrapper functions (diff)
downloadkernel-qcow2-linux-6bdf131fac2336adb1a628f992ba32384f653a55.tar.gz
kernel-qcow2-linux-6bdf131fac2336adb1a628f992ba32384f653a55.tar.xz
kernel-qcow2-linux-6bdf131fac2336adb1a628f992ba32384f653a55.zip
Btrfs: don't leak reloc root nodes on error
We don't track the reloc roots in any sort of normal way, so the only way the root/commit_root nodes get free'd is if the relocation finishes successfully and the reloc root is deleted. Fix this by free'ing them in free_reloc_roots. Thanks, Signed-off-by: Josef Bacik <jbacik@fb.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/relocation.c')
-rw-r--r--fs/btrfs/relocation.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 8e7c78ba77d9..3c0973a68572 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2357,6 +2357,10 @@ void free_reloc_roots(struct list_head *list)
while (!list_empty(list)) {
reloc_root = list_entry(list->next, struct btrfs_root,
root_list);
+ free_extent_buffer(reloc_root->node);
+ free_extent_buffer(reloc_root->commit_root);
+ reloc_root->node = NULL;
+ reloc_root->commit_root = NULL;
__del_reloc_root(reloc_root);
}
}