diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2021-03-12 21:25:00 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-04-19 17:25:19 +0200 |
| commit | 92de551b837650568486b94b67f4168e4c6cc68a (patch) | |
| tree | 08012a77c9ea236dde1bb700d944a9cbe25d15ff /fs/btrfs/relocation.c | |
| parent | btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors (diff) | |
| download | linux-92de551b837650568486b94b67f4168e4c6cc68a.tar.xz linux-92de551b837650568486b94b67f4168e4c6cc68a.zip | |
btrfs: check record_root_in_trans related failures in select_reloc_root
We will record the fs root or the reloc root in the trans in
select_reloc_root. These will actually return errors in the following
patches, so check their return value here and return it up the stack.
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>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/relocation.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index a916b8041705..3c82011e27ff 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -1988,6 +1988,7 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans, struct btrfs_backref_node *next; struct btrfs_root *root; int index = 0; + int ret; next = node; while (1) { @@ -2023,11 +2024,15 @@ struct btrfs_root *select_reloc_root(struct btrfs_trans_handle *trans, } if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) { - record_reloc_root_in_trans(trans, root); + ret = record_reloc_root_in_trans(trans, root); + if (ret) + return ERR_PTR(ret); break; } - btrfs_record_root_in_trans(trans, root); + ret = btrfs_record_root_in_trans(trans, root); + if (ret) + return ERR_PTR(ret); root = root->reloc_root; if (next->new_bytenr != root->node->start) { |