diff options
| author | Sahil Kang | 2017-05-17 12:33:45 +0200 |
|---|---|---|
| committer | David Sterba | 2017-06-19 18:25:59 +0200 |
| commit | 0bef71093d4461659643ddcef431d88a078e0407 (patch) | |
| tree | 3a2eee05e0849f39319001e071e05a41e218786f /fs/btrfs/free-space-tree.c | |
| parent | Btrfs: hardcode GFP_NOFS for btrfs_bio_clone_partial (diff) | |
| download | kernel-qcow2-linux-0bef71093d4461659643ddcef431d88a078e0407.tar.gz kernel-qcow2-linux-0bef71093d4461659643ddcef431d88a078e0407.tar.xz kernel-qcow2-linux-0bef71093d4461659643ddcef431d88a078e0407.zip | |
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: Sahil Kang <sahil.kang@asilaycomputing.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/free-space-tree.c')
| -rw-r--r-- | fs/btrfs/free-space-tree.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c index fc0bd8406758..c7397b055119 100644 --- a/fs/btrfs/free-space-tree.c +++ b/fs/btrfs/free-space-tree.c @@ -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); clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags); - ret = btrfs_commit_transaction(trans); - if (ret) - return ret; - - return 0; + return btrfs_commit_transaction(trans); abort: 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); kfree(free_space_root); - ret = btrfs_commit_transaction(trans); - if (ret) - return ret; - - return 0; + return btrfs_commit_transaction(trans); abort: btrfs_abort_transaction(trans, ret); |