Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f84a8bd6 authored by Al Viro's avatar Al Viro
Browse files

btrfs: take allocation of ->tree_root into open_ctree() 



now that we don't need it for sget() anymore...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 815745cf

fs/btrfs/disk-io.c

+5 −3
Original line number Diff line number Diff line
@@ -1215,7 +1215,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root, 
	return 0;

}



struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info)

static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *root = kzalloc(sizeof(*root), GFP_NOFS);

	if (root)
@@ -1895,7 +1895,7 @@ int open_ctree(struct super_block *sb, 
	struct buffer_head *bh;

	struct btrfs_super_block *disk_super;

	struct btrfs_fs_info *fs_info = btrfs_sb(sb);

	struct btrfs_root *tree_root = fs_info->tree_root;

	struct btrfs_root *tree_root;

	struct btrfs_root *extent_root;

	struct btrfs_root *csum_root;

	struct btrfs_root *chunk_root;
@@ -1906,12 +1906,14 @@ int open_ctree(struct super_block *sb, 
	int num_backups_tried = 0;

	int backup_index = 0;



	tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info);

	extent_root = fs_info->extent_root = btrfs_alloc_root(fs_info);

	csum_root = fs_info->csum_root = btrfs_alloc_root(fs_info);

	chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info);

	dev_root = fs_info->dev_root = btrfs_alloc_root(fs_info);



	if (!extent_root || !csum_root || !chunk_root || !dev_root) {

	if (!tree_root || !extent_root || !csum_root ||

	    !chunk_root || !dev_root) {

		err = -ENOMEM;

		goto fail;

	}

fs/btrfs/disk-io.h

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans, 
int btrfs_add_log_tree(struct btrfs_trans_handle *trans,

		       struct btrfs_root *root);



struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

void btrfs_init_lockdep(void);

void btrfs_set_buffer_lockdep_class(u64 objectid,

fs/btrfs/super.c

+0 −5
Original line number Diff line number Diff line
@@ -899,11 +899,6 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, 
	if (!fs_info)

		return ERR_PTR(-ENOMEM);



	fs_info->tree_root = btrfs_alloc_root(fs_info);

	if (!fs_info->tree_root) {

		error = -ENOMEM;

		goto error_fs_info;

	}

	fs_info->fs_devices = fs_devices;



	fs_info->super_copy = kzalloc(BTRFS_SUPER_INFO_SIZE, GFP_NOFS);