Commit 35da5a7e authored by David Sterba's avatar David Sterba
Browse files

btrfs: drop private_data parameter from extent_io_tree_init 



All callers except one pass NULL, so the parameter can be dropped and
the inode::io_tree initialization can be open coded.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3c4f91e2

fs/btrfs/disk-io.c

+4 −4
Original line number Diff line number Diff line
@@ -1044,9 +1044,9 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, 
	root->anon_dev = 0;

	if (!dummy) {

		extent_io_tree_init(fs_info, &root->dirty_log_pages,

				    IO_TREE_ROOT_DIRTY_LOG_PAGES, NULL);

				    IO_TREE_ROOT_DIRTY_LOG_PAGES);

		extent_io_tree_init(fs_info, &root->log_csum_range,

				    IO_TREE_LOG_CSUM_RANGE, NULL);

				    IO_TREE_LOG_CSUM_RANGE);

	}



	spin_lock_init(&root->root_item_lock);
@@ -2250,7 +2250,7 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info) 


	RB_CLEAR_NODE(&BTRFS_I(inode)->rb_node);

	extent_io_tree_init(fs_info, &BTRFS_I(inode)->io_tree,

			    IO_TREE_BTREE_INODE_IO, NULL);

			    IO_TREE_BTREE_INODE_IO);

	extent_map_tree_init(&BTRFS_I(inode)->extent_tree);



	BTRFS_I(inode)->root = btrfs_grab_root(fs_info->tree_root);
@@ -3074,7 +3074,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) 
	fs_info->block_group_cache_tree = RB_ROOT_CACHED;



	extent_io_tree_init(fs_info, &fs_info->excluded_extents,

			    IO_TREE_FS_EXCLUDED_EXTENTS, NULL);

			    IO_TREE_FS_EXCLUDED_EXTENTS);



	mutex_init(&fs_info->ordered_operations_mutex);

	mutex_init(&fs_info->tree_log_mutex);

fs/btrfs/extent-io-tree.c

+2 −3
Original line number Diff line number Diff line
@@ -94,13 +94,12 @@ struct tree_entry { 
};



void extent_io_tree_init(struct btrfs_fs_info *fs_info,

			 struct extent_io_tree *tree, unsigned int owner,

			 void *private_data)

			 struct extent_io_tree *tree, unsigned int owner)

{

	tree->fs_info = fs_info;

	tree->state = RB_ROOT;

	spin_lock_init(&tree->lock);

	tree->private_data = private_data;

	tree->private_data = NULL;

	tree->owner = owner;

	if (owner == IO_TREE_INODE_FILE_EXTENT)

		lockdep_set_class(&tree->lock, &file_extent_tree_class);

fs/btrfs/extent-io-tree.h

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ struct extent_state { 
};



void extent_io_tree_init(struct btrfs_fs_info *fs_info,

			 struct extent_io_tree *tree, unsigned int owner,

			 void *private_data);

			 struct extent_io_tree *tree, unsigned int owner);

void extent_io_tree_release(struct extent_io_tree *tree);



int lock_extent(struct extent_io_tree *tree, u64 start, u64 end,

fs/btrfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -8871,9 +8871,10 @@ struct inode *btrfs_alloc_inode(struct super_block *sb) 


	inode = &ei->vfs_inode;

	extent_map_tree_init(&ei->extent_tree);

	extent_io_tree_init(fs_info, &ei->io_tree, IO_TREE_INODE_IO, inode);

	extent_io_tree_init(fs_info, &ei->io_tree, IO_TREE_INODE_IO);

	ei->io_tree.private_data = inode;

	extent_io_tree_init(fs_info, &ei->file_extent_tree,

			    IO_TREE_INODE_FILE_EXTENT, NULL);

			    IO_TREE_INODE_FILE_EXTENT);

	ei->io_failure_tree = RB_ROOT;

	atomic_set(&ei->sync_writers, 0);

	mutex_init(&ei->log_mutex);

fs/btrfs/relocation.c

+1 −2
Original line number Diff line number Diff line
@@ -3928,8 +3928,7 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info) 
	INIT_LIST_HEAD(&rc->dirty_subvol_roots);

	btrfs_backref_init_cache(fs_info, &rc->backref_cache, 1);

	mapping_tree_init(&rc->reloc_root_tree);

	extent_io_tree_init(fs_info, &rc->processed_blocks,

			    IO_TREE_RELOC_BLOCKS, NULL);

	extent_io_tree_init(fs_info, &rc->processed_blocks, IO_TREE_RELOC_BLOCKS);

	return rc;

}