]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: send: simplify return logic from record_deleted_ref_if_needed()
authorFilipe Manana <fdmanana@suse.com>
Tue, 18 Feb 2025 15:46:25 +0000 (15:46 +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 96aa519e791ac54b101fe5551051e59a05a8cf97..b715557ec7209c2f1a9fd8c12b59d2a77e41577a 100644 (file)
@@ -4712,7 +4712,7 @@ static int record_new_ref_if_needed(u64 dir, struct fs_path *name, void *ctx)
 
 static int record_deleted_ref_if_needed(u64 dir, struct fs_path *name, void *ctx)
 {
-       int ret = 0;
+       int ret;
        struct send_ctx *sctx = ctx;
        struct rb_node *node = NULL;
        struct recorded_ref data;
@@ -4721,7 +4721,7 @@ static int record_deleted_ref_if_needed(u64 dir, struct fs_path *name, void *ctx
 
        ret = get_inode_gen(sctx->parent_root, dir, &dir_gen);
        if (ret < 0)
-               goto out;
+               return ret;
 
        data.dir = dir;
        data.dir_gen = dir_gen;
@@ -4735,7 +4735,7 @@ static int record_deleted_ref_if_needed(u64 dir, struct fs_path *name, void *ctx
                                         &sctx->deleted_refs, name, dir,
                                         dir_gen, sctx);
        }
-out:
+
        return ret;
 }