btrfs: unset reloc control if we fail to recover

commit fb2d83eefef4e1c717205bac71cb1941edf8ae11 upstream.

If we fail to load an fs root, or fail to start a transaction we can
bail without unsetting the reloc control, which leads to problems later
when we free the reloc control but still have it attached to the file
system.

In the normal path we'll end up calling unset_reloc_control() twice, but
all it does is set fs_info->reloc_control = NULL, and we can only have
one balance at a time so it's not racey.

CC: stable@vger.kernel.org # 5.4+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 01074de8432c5344ed87d9097c4769507926b67c..e2803094aac856281fca9b43ed3689d03af06e07 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4581,9 +4581,8 @@ int btrfs_recover_relocation(struct btrfs_root *root)
 
        trans = btrfs_join_transaction(rc->extent_root);
        if (IS_ERR(trans)) {
-               unset_reloc_control(rc);
                err = PTR_ERR(trans);
-               goto out_free;
+               goto out_unset;
        }
 
        rc->merge_reloc_tree = 1;
@@ -4603,7 +4602,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
                if (IS_ERR(fs_root)) {
                        err = PTR_ERR(fs_root);
                        list_add_tail(&reloc_root->root_list, &reloc_roots);
-                       goto out_free;
+                       goto out_unset;
                }
 
                err = __add_reloc_root(reloc_root);
@@ -4613,7 +4612,7 @@ int btrfs_recover_relocation(struct btrfs_root *root)
 
        err = btrfs_commit_transaction(trans);
        if (err)
-               goto out_free;
+               goto out_unset;
 
        merge_reloc_roots(rc);
 
@@ -4629,7 +4628,8 @@ out_clean:
        ret = clean_dirty_subvols(rc);
        if (ret < 0 && !err)
                err = ret;
-out_free:
+out_unset:
+       unset_reloc_control(rc);
        kfree(rc);
 out:
        if (!list_empty(&reloc_roots))