OSDN Git Service

btrfs: Remove unnecessary branching in free-space-tree.c
authorSahil Kang <sahil.kang@asilaycomputing.com>
Wed, 17 May 2017 10:33:45 +0000 (03:33 -0700)
committerDavid Sterba <dsterba@suse.com>
Mon, 19 Jun 2017 16:25:59 +0000 (18:25 +0200)
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>
fs/btrfs/free-space-tree.c

index fc0bd84..c7397b0 100644 (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);
        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);