Skip to content

Commit

Permalink
btrfs: merge free_fs_root helpers
Browse files Browse the repository at this point in the history
The exported helper just calls the static one. There's no obvious reason
to have them separate eg. for performance reasons where the static one
could be better optimized in the same unit. There's a slight decrease in
code size and stack consumption.

Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
David Sterba committed Aug 6, 2018
1 parent 2ffad70 commit 84db5cc
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions fs/btrfs/disk-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@

static const struct extent_io_ops btree_extent_io_ops;
static void end_workqueue_fn(struct btrfs_work *work);
static void free_fs_root(struct btrfs_root *root);
static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
struct btrfs_fs_info *fs_info);
Expand Down Expand Up @@ -1504,7 +1503,7 @@ int btrfs_init_fs_root(struct btrfs_root *root)

return 0;
fail:
/* the caller is responsible to call free_fs_root */
/* The caller is responsible to call btrfs_free_fs_root */
return ret;
}

Expand Down Expand Up @@ -1609,14 +1608,14 @@ struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
ret = btrfs_insert_fs_root(fs_info, root);
if (ret) {
if (ret == -EEXIST) {
free_fs_root(root);
btrfs_free_fs_root(root);
goto again;
}
goto fail;
}
return root;
fail:
free_fs_root(root);
btrfs_free_fs_root(root);
return ERR_PTR(ret);
}

Expand Down Expand Up @@ -3831,10 +3830,10 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,
__btrfs_remove_free_space_cache(root->free_ino_pinned);
if (root->free_ino_ctl)
__btrfs_remove_free_space_cache(root->free_ino_ctl);
free_fs_root(root);
btrfs_free_fs_root(root);
}

static void free_fs_root(struct btrfs_root *root)
void btrfs_free_fs_root(struct btrfs_root *root)
{
iput(root->ino_cache_inode);
WARN_ON(!RB_EMPTY_ROOT(&root->inode_tree));
Expand All @@ -3849,11 +3848,6 @@ static void free_fs_root(struct btrfs_root *root)
btrfs_put_fs_root(root);
}

void btrfs_free_fs_root(struct btrfs_root *root)
{
free_fs_root(root);
}

int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info)
{
u64 root_objectid = 0;
Expand Down

0 comments on commit 84db5cc

Please sign in to comment.