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

btrfs: pass a btrfs_bio to btrfs_submit_compressed_read 



btrfs_submit_compressed_read expects the bio passed to it to be embedded
into a btrfs_bio structure.  Pass the btrfs_bio directly to increase type
safety and make the code self-documenting.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ae42a154

fs/btrfs/compression.c

+8 −8
Original line number Diff line number Diff line
@@ -498,15 +498,15 @@ static noinline int add_ra_bio_pages(struct inode *inode, 
 * After the compressed pages are read, we copy the bytes into the

 * bio we were passed and then call the bio end_io calls

 */

void btrfs_submit_compressed_read(struct bio *bio, int mirror_num)

void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num)

{

	struct btrfs_inode *inode = btrfs_bio(bio)->inode;

	struct btrfs_inode *inode = bbio->inode;

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

	struct extent_map_tree *em_tree = &inode->extent_tree;

	struct compressed_bio *cb;

	unsigned int compressed_len;

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

	u64 file_offset = btrfs_bio(bio)->file_offset;

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

	u64 file_offset = bbio->file_offset;

	u64 em_len;

	u64 em_start;

	struct extent_map *em;
@@ -534,10 +534,10 @@ void btrfs_submit_compressed_read(struct bio *bio, int mirror_num) 
	em_len = em->len;

	em_start = em->start;



	cb->len = bio->bi_iter.bi_size;

	cb->len = bbio->bio.bi_iter.bi_size;

	cb->compressed_len = compressed_len;

	cb->compress_type = em->compress_type;

	cb->orig_bio = bio;

	cb->orig_bio = &bbio->bio;



	free_extent_map(em);
@@ -558,7 +558,7 @@ void btrfs_submit_compressed_read(struct bio *bio, int mirror_num) 
			 &pflags);



	/* include any pages we added in add_ra-bio_pages */

	cb->len = bio->bi_iter.bi_size;

	cb->len = bbio->bio.bi_iter.bi_size;



	btrfs_add_compressed_bio_pages(cb, disk_bytenr);
@@ -573,7 +573,7 @@ void btrfs_submit_compressed_read(struct bio *bio, int mirror_num) 
out_free_bio:

	bio_put(&cb->bbio.bio);

out:

	btrfs_bio_end_io(btrfs_bio(bio), ret);

	btrfs_bio_end_io(bbio, ret);

}



/*

fs/btrfs/compression.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, 
				  blk_opf_t write_flags,

				  struct cgroup_subsys_state *blkcg_css,

				  bool writeback);

void btrfs_submit_compressed_read(struct bio *bio, int mirror_num);

void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num);



unsigned int btrfs_compress_str2level(unsigned int type, const char *str);

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) 


	if (btrfs_op(bio) == BTRFS_MAP_READ &&

	    bio_ctrl->compress_type != BTRFS_COMPRESS_NONE)

		btrfs_submit_compressed_read(bio, mirror_num);

		btrfs_submit_compressed_read(btrfs_bio(bio), mirror_num);

	else

		btrfs_submit_bio(btrfs_bio(bio), mirror_num);