leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Sahil Kang <sahil.kang@asilaycomputing.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Sahil Kang
2017-05-17 03:33:45 -07:00
committed by David Sterba
parent e477094f0d
commit 0bef71093d
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/free-space-tree.c
View File

@@ -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);