Commit 35a8d7da authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

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: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 285599b6

fs/btrfs/btrfs_inode.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/disk-io.c

+0 −6
Original line number Diff line number Diff line
@@ -699,12 +699,6 @@ int btrfs_validate_metadata_buffer(struct btrfs_bio *bbio, 
	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)

fs/btrfs/disk-io.h

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/btrfs/extent_io.c

+10 −9
Original line number Diff line number Diff line
@@ -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;

}

fs/btrfs/inode.c

+0 −20
Original line number Diff line number Diff line
@@ -2695,26 +2695,6 @@ blk_status_t btrfs_extract_ordered_extent(struct btrfs_bio *bbio) 
	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.