diff options
| author | Filipe Manana <fdmanana@suse.com> | 2024-05-22 09:26:44 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-07-11 15:33:20 +0200 |
| commit | ded980eb3fadd79f73a1254e6b26551c4d6c8ab9 (patch) | |
| tree | b3099bf3bc557c2a7f860422d9aca31393a1d63d /fs/btrfs/send.c | |
| parent | 1f8aee298908611e62a6b86241c7451ff19684a4 (diff) | |
| download | linux-ded980eb3fadd79f73a1254e6b26551c4d6c8ab9.tar.gz linux-ded980eb3fadd79f73a1254e6b26551c4d6c8ab9.tar.bz2 linux-ded980eb3fadd79f73a1254e6b26551c4d6c8ab9.zip | |
btrfs: add and use helper to commit the current transaction
We have several places that attach to the current transaction with
btrfs_attach_transaction_barrier() and then commit the transaction if
there is one. Add a helper and use it to deduplicate this pattern.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 289e5e6a6c56..7a82132500a8 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -7998,7 +7998,6 @@ out: */ static int ensure_commit_roots_uptodate(struct send_ctx *sctx) { - struct btrfs_trans_handle *trans; struct btrfs_root *root = sctx->parent_root; if (root && root->node != root->commit_root) @@ -8018,14 +8017,7 @@ commit_trans: * an unnecessary update of the root's item in the root tree when * committing the transaction if that root wasn't changed before. */ - trans = btrfs_attach_transaction_barrier(root); - if (IS_ERR(trans)) { - int ret = PTR_ERR(trans); - - return (ret == -ENOENT) ? 0 : ret; - } - - return btrfs_commit_transaction(trans); + return btrfs_commit_current_transaction(root); } /* |