Commit f9763e4d authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba

btrfs: send: get rid of the label and gotos at ensure_commit_roots_uptodate()

Now that there is a helper to commit the current transaction and we are
using it, there's no need for the label and goto statements at
ensure_commit_roots_uptodate(). So replace them with direct return
statements that call btrfs_commit_current_transaction().
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ded980eb
......@@ -8001,23 +8001,15 @@ static int ensure_commit_roots_uptodate(struct send_ctx *sctx)
struct btrfs_root *root = sctx->parent_root;
if (root && root->node != root->commit_root)
goto commit_trans;
return btrfs_commit_current_transaction(root);
for (int i = 0; i < sctx->clone_roots_cnt; i++) {
root = sctx->clone_roots[i].root;
if (root->node != root->commit_root)
goto commit_trans;
return btrfs_commit_current_transaction(root);
}
return 0;
commit_trans:
/*
* Use the first root we found. We could use any but that would cause
* an unnecessary update of the root's item in the root tree when
* committing the transaction if that root wasn't changed before.
*/
return btrfs_commit_current_transaction(root);
}
/*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment