From: Filipe Manana <fdmanana@suse.com>
Date: Thu, 20 Feb 2025 10:59:13 +0000 (+0000)
Subject: btrfs: send: simplify return logic from send_rmdir()
X-Git-Tag: v6.15-rc1~152^2~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d56ccf100adb140c5655c624fedf7545d569e0;p=thirdparty%2Fkernel%2Flinux.git

btrfs: send: simplify return logic from send_rmdir()

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 cbc9ca9db062e..0c496270e10f8 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -878,14 +878,13 @@ static int send_rmdir(struct send_ctx *sctx, struct fs_path *path)
 
 	ret = begin_cmd(sctx, BTRFS_SEND_C_RMDIR);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);
 
 	ret = send_cmd(sctx);
 
 tlv_put_failure:
-out:
 	return ret;
 }