diff options
| author |   Josef Bacik <josef@toxicpanda.com> | 2021-03-12 15:25:25 -0500 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2021-04-19 17:25:21 +0200 |
| commit | eb6b7fb4b544ae0ab19a85b55ca548d838dc4beb (patch) | |
| tree | 969bde38f44555761876f08c2ecbdcaebe71f4e9 /fs/btrfs | |
| parent | btrfs: handle errors in reference count manipulation in replace_path (diff) | |
| download | linux-dev-eb6b7fb4b544ae0ab19a85b55ca548d838dc4beb.tar.xz linux-dev-eb6b7fb4b544ae0ab19a85b55ca548d838dc4beb.zip | |
btrfs: handle extent reference errors in do_relocation
We can already deal with errors appropriately from do_relocation, simply
handle any errors that come from changing the refs at this point
cleanly. We have to abort the transaction if we fail here as we've
modified metadata at this point.
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 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/relocation.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 2663c4bf0948..2d82e5170e4c 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -2437,10 +2437,11 @@ static int do_relocation(struct btrfs_trans_handle *trans, btrfs_init_tree_ref(&ref, node->level, btrfs_header_owner(upper->eb)); ret = btrfs_inc_extent_ref(trans, &ref); - BUG_ON(ret); - - ret = btrfs_drop_subtree(trans, root, eb, upper->eb); - BUG_ON(ret); + if (!ret) + ret = btrfs_drop_subtree(trans, root, eb, + upper->eb); + if (ret) + btrfs_abort_transaction(trans, ret); } next: if (!upper->pending) |