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: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 27bea05..c12e317 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -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 @@ out_free_compressed_pages:
 out_free_bio:
        bio_put(&cb->bbio.bio);
 out:
-       btrfs_bio_end_io(btrfs_bio(bio), ret);
+       btrfs_bio_end_io(bbio, ret);
 }
 
 /*

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 95d2e85..692bafa 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -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);
 

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 2e59425..2b9e247 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -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);