From e7aff33e31610729f0c9c487f0e262cf96e98ebb Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 10 Feb 2023 08:48:36 +0100 Subject: 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: Johannes Thumshirn Signed-off-by: Christoph Hellwig Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/compression.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'fs/btrfs') diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 6fd9c6efe387..f7b6c0baae80 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -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); -- cgit v1.2.3