Commit 1038614e authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 47c9dbc7

fs/btrfs/uuid-tree.c

+6 −10
Original line number Diff line number Diff line
@@ -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;

}