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

btrfs: remove extent_map::bdev 



We can now remove the bdev from extent_map. Previous patches made sure
that bio_set_dev is correctly in all places and that we don't need to
grab it from latest_bdev or pass it around inside the extent map.

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

fs/btrfs/disk-io.c

+0 −3
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ struct extent_map *btree_get_extent(struct btrfs_inode *inode, 
		struct page *page, size_t pg_offset, u64 start, u64 len,

		int create)

{

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct extent_map *em;

	int ret;
@@ -213,7 +212,6 @@ struct extent_map *btree_get_extent(struct btrfs_inode *inode, 
	read_lock(&em_tree->lock);

	em = lookup_extent_mapping(em_tree, start, len);

	if (em) {

		em->bdev = fs_info->fs_devices->latest_bdev;

		read_unlock(&em_tree->lock);

		goto out;

	}
@@ -228,7 +226,6 @@ struct extent_map *btree_get_extent(struct btrfs_inode *inode, 
	em->len = (u64)-1;

	em->block_len = (u64)-1;

	em->block_start = 0;

	em->bdev = fs_info->fs_devices->latest_bdev;



	write_lock(&em_tree->lock);

	ret = add_extent_mapping(em_tree, em, 0);

fs/btrfs/extent_io.c

+0 −2
Original line number Diff line number Diff line
@@ -3154,7 +3154,6 @@ static int __do_readpage(struct extent_io_tree *tree, 
			offset = em->block_start + extent_offset;

			disk_io_size = iosize;

		}

		bdev = em->bdev;

		block_start = em->block_start;

		if (test_bit(EXTENT_FLAG_PREALLOC, &em->flags))

			block_start = EXTENT_MAP_HOLE;
@@ -3491,7 +3490,6 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, 
		iosize = min(em_end - cur, end - cur + 1);

		iosize = ALIGN(iosize, blocksize);

		offset = em->block_start + extent_offset;

		bdev = em->bdev;

		block_start = em->block_start;

		compressed = test_bit(EXTENT_FLAG_COMPRESSED, &em->flags);

		free_extent_map(em);

fs/btrfs/extent_map.c

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ static int mergable_maps(struct extent_map *prev, struct extent_map *next) 
		ASSERT(test_bit(EXTENT_FLAG_FS_MAPPING, &prev->flags) &&

		       test_bit(EXTENT_FLAG_FS_MAPPING, &next->flags));



	if (prev->bdev || next->bdev)

		ASSERT(prev->bdev == next->bdev);



	if (extent_map_end(prev) == next->start &&

	    prev->flags == next->flags &&

	    prev->map_lookup == next->map_lookup &&

fs/btrfs/extent_map.h

+2 −9
Original line number Diff line number Diff line
@@ -42,15 +42,8 @@ struct extent_map { 
	u64 block_len;

	u64 generation;

	unsigned long flags;

	struct {

		struct block_device *bdev;



		/*

		 * used for chunk mappings

		 * flags & EXTENT_FLAG_FS_MAPPING must be set

		 */

	/* Used for chunk mappings, flag EXTENT_FLAG_FS_MAPPING must be set */

	struct map_lookup *map_lookup;

	};

	refcount_t refs;

	unsigned int compress_type;

	struct list_head list;

fs/btrfs/file-item.c

+0 −1
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ void btrfs_extent_item_to_extent_map(struct btrfs_inode *inode, 
	u8 type = btrfs_file_extent_type(leaf, fi);

	int compress_type = btrfs_file_extent_compression(leaf, fi);



	em->bdev = fs_info->fs_devices->latest_bdev;

	btrfs_item_key_to_cpu(leaf, &key, slot);

	extent_start = key.offset;