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.k...@asilaycomputing.com>
---
 fs/btrfs/free-space-tree.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index 53dbeaf..ac7dcaf 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1185,11 +1185,7 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info 
*fs_info)
        btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
        fs_info->creating_free_space_tree = 0;
 
-       ret = btrfs_commit_transaction(trans, tree_root);
-       if (ret)
-               return ret;
-
-       return 0;
+       return btrfs_commit_transaction(trans, tree_root);
 
 abort:
        fs_info->creating_free_space_tree = 0;
@@ -1273,11 +1269,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, tree_root);
-       if (ret)
-               return ret;
-
-       return 0;
+       return btrfs_commit_transaction(trans, tree_root);
 
 abort:
        btrfs_abort_transaction(trans, tree_root, ret);
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to