]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: remove pointless out label from add_free_space_extent()
authorFilipe Manana <fdmanana@suse.com>
Wed, 11 Jun 2025 12:00:44 +0000 (13:00 +0100)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Jul 2025 21:58:02 +0000 (23:58 +0200)
All we do under the label is to return, so there's no point in having it,
just return directly whenever we get an error.

Reviewed-by: Boris Burkov <boris@bur.io>
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/free-space-tree.c

index cba097dbdebb1a35e33f9fa13a2739127b7a216f..1f76860ec61e015f50da242fa0862e0a3282078e 100644 (file)
@@ -900,7 +900,7 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans,
 
        ret = btrfs_search_prev_slot(trans, root, &key, path, -1, 1);
        if (ret)
-               goto out;
+               return ret;
 
        btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
 
@@ -923,7 +923,7 @@ static int add_free_space_extent(struct btrfs_trans_handle *trans,
        if (found_end == start) {
                ret = btrfs_del_item(trans, root, path);
                if (ret)
-                       goto out;
+                       return ret;
                new_key.objectid = found_start;
                new_key.offset += key.offset;
                new_extents--;
@@ -940,7 +940,7 @@ right:
 
        ret = btrfs_search_prev_slot(trans, root, &key, path, -1, 1);
        if (ret)
-               goto out;
+               return ret;
 
        btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
 
@@ -964,7 +964,7 @@ right:
        if (found_start == end) {
                ret = btrfs_del_item(trans, root, path);
                if (ret)
-                       goto out;
+                       return ret;
                new_key.offset += key.offset;
                new_extents--;
        }
@@ -974,14 +974,10 @@ insert:
        /* Insert the new key (cases 1-4). */
        ret = btrfs_insert_empty_item(trans, root, path, &new_key, 0);
        if (ret)
-               goto out;
+               return ret;
 
        btrfs_release_path(path);
-       ret = update_free_space_extent_count(trans, block_group, path,
-                                            new_extents);
-
-out:
-       return ret;
+       return update_free_space_extent_count(trans, block_group, path, new_extents);
 }
 
 EXPORT_FOR_TESTS