Commit 2d5ac130 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: don't use bio->bi_private to pass the inode to submit_one_bio 



submit_one_bio is only used for page cache I/O, so the inode can be
trivially derived from the first page in the bio.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 234fdd28

fs/btrfs/extent_io.c

+1 −5
Original line number Diff line number Diff line
@@ -181,10 +181,7 @@ static int add_extent_changeset(struct extent_state *state, u32 bits, 
static void submit_one_bio(struct bio *bio, int mirror_num,

			   enum btrfs_compression_type compress_type)

{

	struct extent_io_tree *tree = bio->bi_private;

	struct inode *inode = tree->private_data;



	bio->bi_private = NULL;

	struct inode *inode = bio_first_page_all(bio)->mapping->host;



	/* Caller should ensure the bio has at least some range added */

	ASSERT(bio->bi_iter.bi_size);
@@ -3362,7 +3359,6 @@ static int alloc_new_bio(struct btrfs_inode *inode, 
	bio_ctrl->bio = bio;

	bio_ctrl->compress_type = compress_type;

	bio->bi_end_io = end_io_func;

	bio->bi_private = &inode->io_tree;

	bio->bi_opf = opf;

	ret = calc_bio_boundaries(bio_ctrl, inode, file_offset);

	if (ret < 0)