Commit 3c925863 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: handle __add_reloc_root failures in btrfs_recover_relocation

We can already handle errors appropriately from this function, deal with
an error coming from __add_reloc_root appropriately.
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ add comment ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 790c1b8c
...@@ -4059,7 +4059,12 @@ int btrfs_recover_relocation(struct btrfs_root *root) ...@@ -4059,7 +4059,12 @@ int btrfs_recover_relocation(struct btrfs_root *root)
} }
err = __add_reloc_root(reloc_root); err = __add_reloc_root(reloc_root);
BUG_ON(err < 0); /* -ENOMEM or logic error */ if (err) {
list_add_tail(&reloc_root->root_list, &reloc_roots);
btrfs_put_root(fs_root);
btrfs_end_transaction(trans);
goto out_unset;
}
fs_root->reloc_root = btrfs_grab_root(reloc_root); fs_root->reloc_root = btrfs_grab_root(reloc_root);
btrfs_put_root(fs_root); btrfs_put_root(fs_root);
} }
...@@ -4274,7 +4279,11 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans, ...@@ -4274,7 +4279,11 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
return PTR_ERR(reloc_root); return PTR_ERR(reloc_root);
ret = __add_reloc_root(reloc_root); ret = __add_reloc_root(reloc_root);
BUG_ON(ret < 0); if (ret) {
/* Pairs with create_reloc_root */
btrfs_put_root(reloc_root);
return ret;
}
new_root->reloc_root = btrfs_grab_root(reloc_root); new_root->reloc_root = btrfs_grab_root(reloc_root);
if (rc->create_reloc_tree) if (rc->create_reloc_tree)
......
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