btrfs: remove now spurious bio submission helpers

Call btrfs_submit_bio and btrfs_submit_compressed_read directly from
submit_one_bio now that all additional functionality has moved into
btrfs_submit_bio.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index b83b731c63e13ee2b51781b3f9e9265b26db193f..49a92aa65de1f6dbba450df456183e9ab48f7277 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -405,9 +405,6 @@ static inline void btrfs_inode_split_flags(u64 inode_item_flags,
 #define CSUM_FMT                               "0x%*phN"
 #define CSUM_FMT_VALUE(size, bytes)            size, bytes
 
-void btrfs_submit_data_write_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num);
-void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
-                       int mirror_num, enum btrfs_compression_type compress_type);
 int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,
                            u32 pgoff, u8 *csum, const u8 * const csum_expected);
 blk_status_t btrfs_extract_ordered_extent(struct btrfs_bio *bbio);

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index a84b662fdd220d79df68840d85486125caac91de..0da0bde347e54adebd07337648a006df05a18a4c 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -699,12 +699,6 @@ err:
        return ret;
 }
 
-void btrfs_submit_metadata_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)
-{
-       bio->bi_opf |= REQ_META;
-       btrfs_submit_bio(bio, mirror_num);
-}
-
 #ifdef CONFIG_MIGRATION
 static int btree_migrate_folio(struct address_space *mapping,
                struct folio *dst, struct folio *src, enum migrate_mode mode)

diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index f2dd4c6d9c258bd57e7dd6477cb562a4c9811039..3b53fc29a85888616cdd2f32dade0434c1818f0c 100644 (file)
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -86,7 +86,6 @@ void btrfs_drop_and_free_fs_root(struct btrfs_fs_info *fs_info,
 int btrfs_validate_metadata_buffer(struct btrfs_bio *bbio,
                                   struct page *page, u64 start, u64 end,
                                   int mirror);
-void btrfs_submit_metadata_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num);
 #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
 struct btrfs_root *btrfs_alloc_dummy_root(struct btrfs_fs_info *fs_info);
 #endif

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 03dac03a30830a877ea6799537b071e610e3dbd8..34c044501f8a69ff813d54b88d8377789894ce40 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -125,7 +125,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
 {
        struct bio *bio;
        struct bio_vec *bv;
-       struct btrfs_inode *inode;
+       struct inode *inode;
        int mirror_num;
 
        if (!bio_ctrl->bio)
@@ -133,7 +133,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
 
        bio = bio_ctrl->bio;
        bv = bio_first_bvec_all(bio);
-       inode = BTRFS_I(bv->bv_page->mapping->host);
+       inode = bv->bv_page->mapping->host;
        mirror_num = bio_ctrl->mirror_num;
 
        /* Caller should ensure the bio has at least some range added */
@@ -141,7 +141,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
 
        btrfs_bio(bio)->file_offset = page_offset(bv->bv_page) + bv->bv_offset;
 
-       if (!is_data_inode(&inode->vfs_inode)) {
+       if (!is_data_inode(inode)) {
                if (btrfs_op(bio) != BTRFS_MAP_WRITE) {
                        /*
                         * For metadata read, we should have the parent_check,
@@ -152,14 +152,15 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
                               bio_ctrl->parent_check,
                               sizeof(struct btrfs_tree_parent_check));
                }
-               btrfs_submit_metadata_bio(inode, bio, mirror_num);
-       } else if (btrfs_op(bio) == BTRFS_MAP_WRITE) {
-               btrfs_submit_data_write_bio(inode, bio, mirror_num);
-       } else {
-               btrfs_submit_data_read_bio(inode, bio, mirror_num,
-                                          bio_ctrl->compress_type);
+               bio->bi_opf |= REQ_META;
        }
 
+       if (btrfs_op(bio) == BTRFS_MAP_READ &&
+           bio_ctrl->compress_type != BTRFS_COMPRESS_NONE)
+               btrfs_submit_compressed_read(inode, bio, mirror_num);
+       else
+               btrfs_submit_bio(bio, mirror_num);
+
        /* The bio is owned by the end_io handler now */
        bio_ctrl->bio = NULL;
 }

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index bd83633f8ad228a03cb1a150a861d8e23d6ce7cd..74b45b2a3bee4965edb1da1835660843ccb55ebd 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2695,26 +2695,6 @@ out:
        return errno_to_blk_status(ret);
 }
 
-void btrfs_submit_data_write_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)
-{
-       btrfs_submit_bio(bio, mirror_num);
-}
-
-void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
-                       int mirror_num, enum btrfs_compression_type compress_type)
-{
-       if (compress_type != BTRFS_COMPRESS_NONE) {
-               /*
-                * btrfs_submit_compressed_read will handle completing the bio
-                * if there were any errors, so just return here.
-                */
-               btrfs_submit_compressed_read(&inode->vfs_inode, bio, mirror_num);
-               return;
-       }
-
-       btrfs_submit_bio(bio, mirror_num);
-}
-
 /*
  * given a list of ordered sums record them in the inode.  This happens
  * at IO completion time based on sums calculated at bio submission time.