From: Filipe Manana Date: Wed, 22 May 2024 08:33:32 +0000 (+0100) Subject: btrfs: send: get rid of the label and gotos at ensure_commit_roots_uptodate() X-Git-Tag: v6.11-rc1~157^2~112 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9763e4d150f22b18e79f1ef7ad2bee0059d02ff;p=thirdparty%2Fkernel%2Flinux.git 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: Josef Bacik Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba --- diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 7a82132500a84..2099b5f8c0226 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -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); } /*