diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2021-03-12 15:25:13 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-04-19 17:25:20 +0200 |
| commit | 00bb36a0e76ab7e94bdd70d561baf25f9bc1415d (patch) | |
| tree | 45c396ebd5bf224e4c1ebf10246bde515c5ddf49 /fs/btrfs | |
| parent | 03a7e111a94961092e2832a6259d39c8c01d6def (diff) | |
btrfs: have proper error handling in btrfs_init_reloc_root
create_reloc_root will return errors in the future, and __add_reloc_root
can return ENOMEM or EEXIST, so handle these errors properly.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ add comment ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/relocation.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 7966950d7f51..22c80f5a9137 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -856,9 +856,15 @@ int btrfs_init_reloc_root(struct btrfs_trans_handle *trans, reloc_root = create_reloc_root(trans, root, root->root_key.objectid); if (clear_rsv) trans->block_rsv = rsv; + if (IS_ERR(reloc_root)) + return PTR_ERR(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; + } root->reloc_root = btrfs_grab_root(reloc_root); return 0; } |