btrfs: remove pointless out labels from inode.c

Some functions (insert_inline_extent() and insert_reserved_file_extent())
have an 'out' label that does nothing but return, making it pointless.
Simplify this by removing the label and returning instead of gotos plus
setting the 'ret' variable.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
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/inode.c b/fs/btrfs/inode.c
index 6637e451992fd4032014e81fd5d3f644885f487a..10609b8199a082b4e24a63f38504014e9aba5b59 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -507,7 +507,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
                ret = btrfs_insert_empty_item(trans, root, path, &key,
                                              datasize);
                if (ret)
-                       goto fail;
+                       return ret;
        }
        leaf = path->nodes[0];
        ei = btrfs_item_ptr(leaf, path->slots[0],
@@ -546,7 +546,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
        ret = btrfs_inode_set_file_extent_range(inode, 0,
                                        ALIGN(size, root->fs_info->sectorsize));
        if (ret)
-               goto fail;
+               return ret;
 
        /*
         * We're an inline extent, so nobody can extend the file past i_size
@@ -562,8 +562,7 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
        }
        inode->disk_i_size = i_size;
 
-fail:
-       return ret;
+       return 0;
 }
 
 static bool can_cow_file_range_inline(struct btrfs_inode *inode,
@@ -3037,7 +3036,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
        drop_args.extent_item_size = sizeof(*stack_fi);
        ret = btrfs_drop_extents(trans, root, inode, &drop_args);
        if (ret)
-               goto out;
+               return ret;
 
        if (!drop_args.extent_inserted) {
                ins.objectid = btrfs_ino(inode);
@@ -3047,7 +3046,7 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
                ret = btrfs_insert_empty_item(trans, root, path, &ins,
                                              sizeof(*stack_fi));
                if (ret)
-                       goto out;
+                       return ret;
        }
        leaf = path->nodes[0];
        btrfs_set_stack_file_extent_generation(stack_fi, trans->transid);
@@ -3082,13 +3081,11 @@ static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
 
        ret = btrfs_inode_set_file_extent_range(inode, file_pos, ram_bytes);
        if (ret)
-               goto out;
+               return ret;
 
-       ret = btrfs_alloc_reserved_file_extent(trans, root, btrfs_ino(inode),
-                                              file_pos - offset,
-                                              qgroup_reserved, &ins);
-out:
-       return ret;
+       return btrfs_alloc_reserved_file_extent(trans, root, btrfs_ino(inode),
+                                               file_pos - offset,
+                                               qgroup_reserved, &ins);
 }
 
 static void btrfs_release_delalloc_bytes(struct btrfs_fs_info *fs_info,