[PATCH] btrfs: remove pointless out label in qgroup_account_snapshot()

[PATCH] btrfs: remove pointless out label in qgroup_account_snapshot()

[fdmanana]

From: Filipe Manana <fdmanana@suse.com>

The 'out' label is pointless as there are no cleanups to perform there,
we can replace every goto with a direct return.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 fs/btrfs/transaction.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 746678044fed..98fb8c515a13 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1602,16 +1602,16 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
 
 	ret = commit_fs_roots(trans);
 	if (ret)
-		goto out;
+		return ret;
 	ret = btrfs_qgroup_account_extents(trans);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	/* Now qgroup are all updated, we can inherit it to new qgroups */
 	ret = btrfs_qgroup_inherit(trans, btrfs_root_id(src), dst_objectid,
 				   btrfs_root_id(parent), inherit);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	/*
 	 * Now we do a simplified commit transaction, which will:
@@ -1627,23 +1627,22 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
 	 */
 	ret = commit_cowonly_roots(trans);
 	if (ret)
-		goto out;
+		return ret;
 	switch_commit_roots(trans);
 	ret = btrfs_write_and_wait_transaction(trans);
-	if (unlikely(ret))
+	if (unlikely(ret)) {
 		btrfs_err(fs_info,
 "error while writing out transaction during qgroup snapshot accounting: %d", ret);
+		return ret;
+	}
 
-out:
 	/*
 	 * Force parent root to be updated, as we recorded it before so its
 	 * last_trans == cur_transid.
 	 * Or it won't be committed again onto disk after later
 	 * insert_dir_item()
 	 */
-	if (!ret)
-		ret = record_root_in_trans(trans, parent, 1);
-	return ret;
+	return record_root_in_trans(trans, parent, 1);
 }
 
 /*
-- 
2.47.2

Re: [PATCH] btrfs: remove pointless out label in qgroup_account_snapshot()

[David Sterba]

On Tue, Feb 10, 2026 at 12:10:27PM +0000, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> The 'out' label is pointless as there are no cleanups to perform there,
> we can replace every goto with a direct return.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: David Sterba <dsterba@suse.com>

Re: [PATCH] btrfs: remove pointless out label in qgroup_account_snapshot()

[Qu Wenruo]

在 2026/2/10 22:40, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
> 
> The 'out' label is pointless as there are no cleanups to perform there,
> we can replace every goto with a direct return.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   fs/btrfs/transaction.c | 17 ++++++++---------
>   1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
> index 746678044fed..98fb8c515a13 100644
> --- a/fs/btrfs/transaction.c
> +++ b/fs/btrfs/transaction.c
> @@ -1602,16 +1602,16 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
>   
>   	ret = commit_fs_roots(trans);
>   	if (ret)
> -		goto out;
> +		return ret;
>   	ret = btrfs_qgroup_account_extents(trans);
>   	if (ret < 0)
> -		goto out;
> +		return ret;
>   
>   	/* Now qgroup are all updated, we can inherit it to new qgroups */
>   	ret = btrfs_qgroup_inherit(trans, btrfs_root_id(src), dst_objectid,
>   				   btrfs_root_id(parent), inherit);
>   	if (ret < 0)
> -		goto out;
> +		return ret;
>   
>   	/*
>   	 * Now we do a simplified commit transaction, which will:
> @@ -1627,23 +1627,22 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans,
>   	 */
>   	ret = commit_cowonly_roots(trans);
>   	if (ret)
> -		goto out;
> +		return ret;
>   	switch_commit_roots(trans);
>   	ret = btrfs_write_and_wait_transaction(trans);
> -	if (unlikely(ret))
> +	if (unlikely(ret)) {
>   		btrfs_err(fs_info,
>   "error while writing out transaction during qgroup snapshot accounting: %d", ret);
> +		return ret;
> +	}
>   
> -out:
>   	/*
>   	 * Force parent root to be updated, as we recorded it before so its
>   	 * last_trans == cur_transid.
>   	 * Or it won't be committed again onto disk after later
>   	 * insert_dir_item()
>   	 */
> -	if (!ret)
> -		ret = record_root_in_trans(trans, parent, 1);
> -	return ret;
> +	return record_root_in_trans(trans, parent, 1);
>   }
>   
>   /*