From: Filipe Manana <fdmanana@suse.com>
Date: Thu, 20 Feb 2025 10:57:05 +0000 (+0000)
Subject: btrfs: send: simplify return logic from send_rename()
X-Git-Tag: v6.15-rc1~152^2~91
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=264515c7cb62661d07f82e4fbb4c5a40ae88a0a3;p=thirdparty%2Flinux.git

btrfs: send: simplify return logic from send_rename()

There is no need to have an 'out' label and jump into it since there are
no resource cleanups to perform (release locks, free memory, etc), so
make this simpler by removing the label and goto and instead return
directly.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index f161e6a695bd1..d5c151651d07c 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -809,7 +809,7 @@ static int send_rename(struct send_ctx *sctx,
 
 	ret = begin_cmd(sctx, BTRFS_SEND_C_RENAME);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, from);
 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH_TO, to);
@@ -817,7 +817,6 @@ static int send_rename(struct send_ctx *sctx,
 	ret = send_cmd(sctx);
 
 tlv_put_failure:
-out:
 	return ret;
 }