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

Commit c8bf1b67 authored by David Sterba's avatar David Sterba
Browse files

btrfs: remove mapping tree structures indirection 



fs_info::mapping_tree is the physical<->logical mapping tree and uses
the same underlying structure as extents, but is embedded to another
structure. There are no other members and this indirection is useless.
No functional change.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 49cc180c

fs/btrfs/ctree.h

+1 −5
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ static inline u32 count_max_extents(u64 size) 
	return div_u64(size + BTRFS_MAX_EXTENT_SIZE - 1, BTRFS_MAX_EXTENT_SIZE);

}



struct btrfs_mapping_tree {

	struct extent_map_tree map_tree;

};



static inline unsigned long btrfs_chunk_item_size(int num_stripes)

{

	BUG_ON(num_stripes == 0);
@@ -830,7 +826,7 @@ struct btrfs_fs_info { 
	struct extent_io_tree *pinned_extents;



	/* logical->physical extent mapping */

	struct btrfs_mapping_tree mapping_tree;

	struct extent_map_tree mapping_tree;



	/*

	 * block reservation for extent, checksum, root tree and

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static void btrfs_dev_replace_update_device_in_mapping_tree( 
						struct btrfs_device *srcdev,

						struct btrfs_device *tgtdev)

{

	struct extent_map_tree *em_tree = &fs_info->mapping_tree.map_tree;

	struct extent_map_tree *em_tree = &fs_info->mapping_tree;

	struct extent_map *em;

	struct map_lookup *map;

	u64 start = 0;

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -2684,7 +2684,7 @@ int open_ctree(struct super_block *sb, 
	INIT_LIST_HEAD(&fs_info->space_info);

	INIT_LIST_HEAD(&fs_info->tree_mod_seq_list);

	INIT_LIST_HEAD(&fs_info->unused_bgs);

	btrfs_mapping_init(&fs_info->mapping_tree);

	extent_map_tree_init(&fs_info->mapping_tree);

	btrfs_init_block_rsv(&fs_info->global_block_rsv,

			     BTRFS_BLOCK_RSV_GLOBAL);

	btrfs_init_block_rsv(&fs_info->trans_block_rsv, BTRFS_BLOCK_RSV_TRANS);

fs/btrfs/extent-tree.c

+7 −7
Original line number Diff line number Diff line
@@ -9960,7 +9960,7 @@ static int find_first_block_group(struct btrfs_fs_info *fs_info, 
			struct extent_map_tree *em_tree;

			struct extent_map *em;



			em_tree = &root->fs_info->mapping_tree.map_tree;

			em_tree = &root->fs_info->mapping_tree;

			read_lock(&em_tree->lock);

			em = lookup_extent_mapping(em_tree, found_key.objectid,

						   found_key.offset);
@@ -10254,21 +10254,21 @@ btrfs_create_block_group_cache(struct btrfs_fs_info *fs_info, 
 */

static int check_chunk_block_group_mappings(struct btrfs_fs_info *fs_info)

{

	struct btrfs_mapping_tree *map_tree = &fs_info->mapping_tree;

	struct extent_map_tree *map_tree = &fs_info->mapping_tree;

	struct extent_map *em;

	struct btrfs_block_group_cache *bg;

	u64 start = 0;

	int ret = 0;



	while (1) {

		read_lock(&map_tree->map_tree.lock);

		read_lock(&map_tree->lock);

		/*

		 * lookup_extent_mapping will return the first extent map

		 * intersecting the range, so setting @len to 1 is enough to

		 * get the first chunk.

		 */

		em = lookup_extent_mapping(&map_tree->map_tree, start, 1);

		read_unlock(&map_tree->map_tree.lock);

		em = lookup_extent_mapping(map_tree, start, 1);

		read_unlock(&map_tree->lock);

		if (!em)

			break;
@@ -10864,7 +10864,7 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, 
	if (remove_em) {

		struct extent_map_tree *em_tree;



		em_tree = &fs_info->mapping_tree.map_tree;

		em_tree = &fs_info->mapping_tree;

		write_lock(&em_tree->lock);

		remove_extent_mapping(em_tree, em);

		write_unlock(&em_tree->lock);
@@ -10882,7 +10882,7 @@ struct btrfs_trans_handle * 
btrfs_start_trans_remove_block_group(struct btrfs_fs_info *fs_info,

				     const u64 chunk_offset)

{

	struct extent_map_tree *em_tree = &fs_info->mapping_tree.map_tree;

	struct extent_map_tree *em_tree = &fs_info->mapping_tree;

	struct extent_map *em;

	struct map_lookup *map;

	unsigned int num_items;

fs/btrfs/free-space-cache.c

+1 −1
Original line number Diff line number Diff line
@@ -3358,7 +3358,7 @@ void btrfs_put_block_group_trimming(struct btrfs_block_group_cache *block_group) 


	if (cleanup) {

		mutex_lock(&fs_info->chunk_mutex);

		em_tree = &fs_info->mapping_tree.map_tree;

		em_tree = &fs_info->mapping_tree;

		write_lock(&em_tree->lock);

		em = lookup_extent_mapping(em_tree, block_group->key.objectid,

					   1);