Commit e7aff33e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: use the bbio file offset in btrfs_submit_compressed_read 



struct btrfs_bio now has a file_offset field set up by all submitters.
Use that in btrfs_submit_compressed_read instead of recalculating the
value.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 798c9fc7

fs/btrfs/compression.c

+1 −4
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void btrfs_submit_compressed_read(struct bio *bio, int mirror_num) 
	struct bio *comp_bio;

	const u64 disk_bytenr = bio->bi_iter.bi_sector << SECTOR_SHIFT;

	u64 cur_disk_byte = disk_bytenr;

	u64 file_offset;

	u64 file_offset = btrfs_bio(bio)->file_offset;

	u64 em_len;

	u64 em_start;

	struct extent_map *em;
@@ -542,9 +542,6 @@ void btrfs_submit_compressed_read(struct bio *bio, int mirror_num) 
	blk_status_t ret;

	int ret2;



	file_offset = bio_first_bvec_all(bio)->bv_offset +

		      page_offset(bio_first_page_all(bio));



	/* we need the actual starting offset of this extent in the file */

	read_lock(&em_tree->lock);

	em = lookup_extent_mapping(em_tree, file_offset, fs_info->sectorsize);