diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2021-03-12 15:25:11 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2021-04-19 17:25:20 +0200 |
| commit | f0118cb6bcd3afefd01b5bcaa4baaddbb6085092 (patch) | |
| tree | c227e23b5e4789dd484ed747e546e29f6671b225 /fs/btrfs | |
| parent | 1409e6cc7461d091b2ef1ad16954972d4ca1c784 (diff) | |
| download | linux-f0118cb6bcd3afefd01b5bcaa4baaddbb6085092.tar.gz | |
btrfs: handle record_root_in_trans failure in create_pending_snapshot
record_root_in_trans can currently fail, so handle this failure properly. 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')
| -rw-r--r-- | fs/btrfs/transaction.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 0b72fe0e5c52..461baad8760c 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1603,8 +1603,9 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, dentry = pending->dentry; parent_inode = pending->dir; parent_root = BTRFS_I(parent_inode)->root; - record_root_in_trans(trans, parent_root, 0); - + ret = record_root_in_trans(trans, parent_root, 0); + if (ret) + goto fail; cur_time = current_time(parent_inode); /* @@ -1640,7 +1641,11 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, goto fail; } - record_root_in_trans(trans, root, 0); + ret = record_root_in_trans(trans, root, 0); + if (ret) { + btrfs_abort_transaction(trans, ret); + goto fail; + } btrfs_set_root_last_snapshot(&root->root_item, trans->transid); memcpy(new_root_item, &root->root_item, sizeof(*new_root_item)); btrfs_check_and_init_root_item(new_root_item); |