diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2020-03-04 11:18:27 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-03-23 17:01:57 +0100 |
| commit | 6217b0fadd4473a16fabc6aecd7527a9f71af534 (patch) | |
| tree | 75d291f37bf2628748596245c533d08ab206daba /fs/btrfs | |
| parent | fb2d83eefef4e1c717205bac71cb1941edf8ae11 (diff) | |
| download | linux-stable-6217b0fadd4473a16fabc6aecd7527a9f71af534.tar.gz linux-stable-6217b0fadd4473a16fabc6aecd7527a9f71af534.tar.bz2 linux-stable-6217b0fadd4473a16fabc6aecd7527a9f71af534.zip | |
btrfs: reloc: clean dirty subvols if we fail to start a transaction
If we do merge_reloc_roots() we could insert a few roots onto the dirty
subvol roots list, where we hold a ref on them. If we fail to start the
transaction we need to run clean_dirty_subvols() in order to cleanup the
refs.
CC: stable@vger.kernel.org # 5.4+
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 78537541059b..d2069d69fc92 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4082,10 +4082,10 @@ restart: goto out_free; } btrfs_commit_transaction(trans); +out_free: ret = clean_dirty_subvols(rc); if (ret < 0 && !err) err = ret; -out_free: btrfs_free_block_rsv(fs_info, rc->block_rsv); btrfs_free_path(path); return err; @@ -4501,10 +4501,10 @@ int btrfs_recover_relocation(struct btrfs_root *root) trans = btrfs_join_transaction(rc->extent_root); if (IS_ERR(trans)) { err = PTR_ERR(trans); - goto out_free; + goto out_clean; } err = btrfs_commit_transaction(trans); - +out_clean: ret = clean_dirty_subvols(rc); if (ret < 0 && !err) err = ret; |