btrfs: remove pointless out labels from uuid-tree.c

Some functions (btrfs_uuid_iter_rem() and btrfs_check_uuid_tree_entry())
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/uuid-tree.c b/fs/btrfs/uuid-tree.c
index e3a1310fa7d5c5a70483fc6f142b42c3c6e5664a..f24c14b9bb2fd7420b06263a5a0c4b889a859bc6 100644 (file)
--- a/fs/btrfs/uuid-tree.c
+++ b/fs/btrfs/uuid-tree.c
@@ -207,15 +207,11 @@ static int btrfs_uuid_iter_rem(struct btrfs_root *uuid_root, u8 *uuid, u8 type,
 
        /* 1 - for the uuid item */
        trans = btrfs_start_transaction(uuid_root, 1);
-       if (IS_ERR(trans)) {
-               ret = PTR_ERR(trans);
-               goto out;
-       }
+       if (IS_ERR(trans))
+               return PTR_ERR(trans);
 
        ret = btrfs_uuid_tree_remove(trans, uuid, type, subid);
        btrfs_end_transaction(trans);
-
-out:
        return ret;
 }
 
@@ -235,14 +231,14 @@ static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,
 
        if (type != BTRFS_UUID_KEY_SUBVOL &&
            type != BTRFS_UUID_KEY_RECEIVED_SUBVOL)
-               goto out;
+               return 0;
 
        subvol_root = btrfs_get_fs_root(fs_info, subvolid, true);
        if (IS_ERR(subvol_root)) {
                ret = PTR_ERR(subvol_root);
                if (ret == -ENOENT)
-                       ret = 1;
-               goto out;
+                       return 1;
+               return ret;
        }
 
        switch (type) {
@@ -257,7 +253,7 @@ static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info,
                break;
        }
        btrfs_put_root(subvol_root);
-out:
+
        return ret;
 }