]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: send: simplify return logic from process_changed_xattr()
authorFilipe Manana <fdmanana@suse.com>
Tue, 18 Feb 2025 16:00:14 +0000 (16:00 +0000)
committerDavid Sterba <dsterba@suse.com>
Tue, 18 Mar 2025 19:35:46 +0000 (20:35 +0100)
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>
fs/btrfs/send.c

index e29b5a5ccdd6eac122533d6c1f5fe64515f3dab4..0cbc8b5b6faba6d2890d3f0d2d262482a9710df9 100644 (file)
@@ -5067,17 +5067,15 @@ static int __process_changed_deleted_xattr(int num, struct btrfs_key *di_key,
 
 static int process_changed_xattr(struct send_ctx *sctx)
 {
-       int ret = 0;
+       int ret;
 
        ret = iterate_dir_item(sctx->send_root, sctx->left_path,
                        __process_changed_new_xattr, sctx);
        if (ret < 0)
-               goto out;
-       ret = iterate_dir_item(sctx->parent_root, sctx->right_path,
-                       __process_changed_deleted_xattr, sctx);
+               return ret;
 
-out:
-       return ret;
+       return iterate_dir_item(sctx->parent_root, sctx->right_path,
+                               __process_changed_deleted_xattr, sctx);
 }
 
 static int process_all_new_xattrs(struct send_ctx *sctx)