Commit 0bef7109 authored by Sahil Kang's avatar Sahil Kang Committed by David Sterba
Browse files

btrfs: Remove unnecessary branching in free-space-tree.c 



Both btrfs_create_free_space_tree and btrfs_clear_free_space_tree
contain:

  if (ret)
          return ret;

  return 0;

The if statement is only false when ret equals zero, and since we return
zero in such cases, we can safely remove the branching.

Signed-off-by: default avatarSahil Kang <sahil.kang@asilaycomputing.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e477094f

fs/btrfs/free-space-tree.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -1188,11 +1188,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info) 
	btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);

	btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);

	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);

	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);





	ret = btrfs_commit_transaction(trans);

	return btrfs_commit_transaction(trans);

	if (ret)

		return ret;



	return 0;





abort:

abort:

	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);

	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);
@@ -1277,11 +1273,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) 
	free_extent_buffer(free_space_root->commit_root);

	free_extent_buffer(free_space_root->commit_root);

	kfree(free_space_root);

	kfree(free_space_root);





	ret = btrfs_commit_transaction(trans);

	return btrfs_commit_transaction(trans);

	if (ret)

		return ret;



	return 0;





abort:

abort:

	btrfs_abort_transaction(trans, ret);

	btrfs_abort_transaction(trans, ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE