]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: send: simplify return logic from send_remove_xattr()
authorFilipe Manana <fdmanana@suse.com>
Tue, 18 Feb 2025 15:36:01 +0000 (15:36 +0000)
committerDavid Sterba <dsterba@suse.com>
Tue, 18 Mar 2025 19:35:45 +0000 (20:35 +0100)
There's no need for the 'out' label as there are no resources to cleanup
in case of an error and we can directly return if begin_cmd() fails.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/send.c

index 653e0b9a94caa404b7ab858e8f9b7677fc71dd9b..5fd3deaf14d6042f963fa8095e45f80fdf160bb2 100644 (file)
@@ -4886,11 +4886,11 @@ static int send_remove_xattr(struct send_ctx *sctx,
                          struct fs_path *path,
                          const char *name, int name_len)
 {
-       int ret = 0;
+       int ret;
 
        ret = begin_cmd(sctx, BTRFS_SEND_C_REMOVE_XATTR);
        if (ret < 0)
-               goto out;
+               return ret;
 
        TLV_PUT_PATH(sctx, BTRFS_SEND_A_PATH, path);
        TLV_PUT_STRING(sctx, BTRFS_SEND_A_XATTR_NAME, name, name_len);
@@ -4898,7 +4898,6 @@ static int send_remove_xattr(struct send_ctx *sctx,
        ret = send_cmd(sctx);
 
 tlv_put_failure:
-out:
        return ret;
 }