btrfs: Derive compression type from extent map during reads
PATCH 1/1 btrfs: Derive compression type from extent map during reads
Derive the compression type from extent map as opposed to the bio flags passed. This makes it more precise and not reliant on function parameters.
fs/btrfs/compression.c +5 -5
@@ -803,7 +803,7 @@ static noinline int add_ra_bio_pages(struct inode *inode,* bio we were passed and then call the bio end_io calls */ blk_status_t btrfs_submit_compressed_read (struct inode *inode,struct bio *bio, -int mirror_num,unsigned long bio_flags) +int mirror_num) {struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);struct extent_map_tree *em_tree;
@@ -855,14 +855,14 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, em_len = em->len; em_start = em->start; -free_extent_map (em); - em =NULL ; - cb->len = bio->bi_iter.bi_size; cb->compressed_len = compressed_len; - cb->compress_type =extent_compress_type (bio_flags); + cb->compress_type = em->compress_type; cb->orig_bio = bio; +free_extent_map (em); + em =NULL ; + nr_pages =DIV_ROUND_UP (compressed_len,PAGE_SIZE ); cb->compressed_pages =kcalloc (nr_pages,sizeof (struct page *),GFP_NOFS );
fs/btrfs/compression.h +1 -1
@@ -103,7 +103,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,struct cgroup_subsys_state *blkcg_css, bool writeback);blk_status_t btrfs_submit_compressed_read (struct inode *inode,struct bio *bio, -int mirror_num,unsigned long bio_flags); +int mirror_num);unsigned int btrfs_compress_str2level (unsigned int type,const char *str);
fs/btrfs/inode.c +1 -2
@@ -2547,8 +2547,7 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,* here. */ ret =btrfs_submit_compressed_read (inode, bio, - mirror_num, - bio_flags); + mirror_num); goto out_no_endio; }else {/*
Signature · 1 line
Goldwyn
Quoted 5 lines · Goldwyn Rodrigues
Derive the compression type from extent map as opposed to the bio flags passed. This makes it more precise and not reliant on function parameters.
Signed-off-by Goldwyn Rodrigues <[email protected]>
This patch also makes extent_compress_type unused so it can be removed. Also extent_set_compress_type also becomes redundant and can be removed.
<snip>
Quoted 11 lines · Nikolay Borisov
Quoted 5 lines · Goldwyn Rodrigues
Derive the compression type from extent map as opposed to the bio flags passed. This makes it more precise and not reliant on function parameters.
Signed-off-by Goldwyn Rodrigues <[email protected]>This patch also makes
extent_compress_typeunused so it can be removed. Alsoextent_set_compress_typealso becomes redundant and can be removed.
I have a cleanup patch removing extent_set_compress_type so I'll rebase it on top of that patch.
Quoted 5 lines · Goldwyn Rodrigues
Derive the compression type from extent map as opposed to the bio flags passed. This makes it more precise and not reliant on function parameters.
Signed-off-by Goldwyn Rodrigues <[email protected]>
Added to misc-next, thanks.