diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2021-03-12 21:25:04 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-04-19 17:25:19 +0200 |
| commit | 2731f5186ba8e641515a01a1016b88f09b34777d (patch) | |
| tree | 8da26ccffc1b823dd66db9d0cffd6e4a1151e623 /fs/btrfs/inode.c | |
| parent | btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename (diff) | |
| download | linux-2731f5186ba8e641515a01a1016b88f09b34777d.tar.xz linux-2731f5186ba8e641515a01a1016b88f09b34777d.zip | |
btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume
btrfs_record_root_in_trans will return errors in the future, so handle
the error properly in btrfs_delete_subvolume.
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 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b8863537d31d..1a349759efae 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4329,7 +4329,11 @@ int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry) goto out_end_trans; } - btrfs_record_root_in_trans(trans, dest); + ret = btrfs_record_root_in_trans(trans, dest); + if (ret) { + btrfs_abort_transaction(trans, ret); + goto out_end_trans; + } memset(&dest->root_item.drop_progress, 0, sizeof(dest->root_item.drop_progress)); |