Commit 81a75f67 authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

btrfs: use bio fields for op and flags 



The bio REQ_OP and bi_rw rq_flag_bits are now always setup, so there is
no need to pass around the rq_flag_bits bits too. btrfs users should
should access the bio insead.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b3d3fa51

fs/btrfs/compression.c

+6 −7
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
		page = compressed_pages[pg_index];

		page->mapping = inode->i_mapping;

		if (bio->bi_iter.bi_size)

			ret = io_tree->ops->merge_bio_hook(WRITE, page, 0,

			ret = io_tree->ops->merge_bio_hook(page, 0,

							   PAGE_SIZE,

							   bio, 0);

		else
@@ -402,7 +402,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
				BUG_ON(ret); /* -ENOMEM */

			}



			ret = btrfs_map_bio(root, WRITE, bio, 0, 1);

			ret = btrfs_map_bio(root, bio, 0, 1);

			BUG_ON(ret); /* -ENOMEM */



			bio_put(bio);
@@ -433,7 +433,7 @@ int btrfs_submit_compressed_write(struct inode *inode, u64 start, 
		BUG_ON(ret); /* -ENOMEM */

	}



	ret = btrfs_map_bio(root, WRITE, bio, 0, 1);

	ret = btrfs_map_bio(root, bio, 0, 1);

	BUG_ON(ret); /* -ENOMEM */



	bio_put(bio);
@@ -659,7 +659,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		page->index = em_start >> PAGE_SHIFT;



		if (comp_bio->bi_iter.bi_size)

			ret = tree->ops->merge_bio_hook(READ, page, 0,

			ret = tree->ops->merge_bio_hook(page, 0,

							PAGE_SIZE,

							comp_bio, 0);

		else
@@ -690,8 +690,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			sums += DIV_ROUND_UP(comp_bio->bi_iter.bi_size,

					     root->sectorsize);



			ret = btrfs_map_bio(root, READ, comp_bio,

					    mirror_num, 0);

			ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);

			if (ret) {

				bio->bi_error = ret;

				bio_endio(comp_bio);
@@ -721,7 +720,7 @@ int btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
		BUG_ON(ret); /* -ENOMEM */

	}



	ret = btrfs_map_bio(root, READ, comp_bio, mirror_num, 0);

	ret = btrfs_map_bio(root, comp_bio, mirror_num, 0);

	if (ret) {

		bio->bi_error = ret;

		bio_endio(comp_bio);

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3091,7 +3091,7 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, 
			     struct btrfs_root *new_root,

			     struct btrfs_root *parent_root,

			     u64 new_dirid);

int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset,

int btrfs_merge_bio_hook(struct page *page, unsigned long offset,

			 size_t size, struct bio *bio,

			 unsigned long bio_flags);

int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

fs/btrfs/disk-io.c

+12 −18
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ struct async_submit_bio { 
	struct list_head list;

	extent_submit_bio_hook_t *submit_bio_start;

	extent_submit_bio_hook_t *submit_bio_done;

	int rw;

	int mirror_num;

	unsigned long bio_flags;

	/*
@@ -797,7 +796,7 @@ static void run_one_async_start(struct btrfs_work *work) 
	int ret;



	async = container_of(work, struct  async_submit_bio, work);

	ret = async->submit_bio_start(async->inode, async->rw, async->bio,

	ret = async->submit_bio_start(async->inode, async->bio,

				      async->mirror_num, async->bio_flags,

				      async->bio_offset);

	if (ret)
@@ -830,9 +829,8 @@ static void run_one_async_done(struct btrfs_work *work) 
		return;

	}



	async->submit_bio_done(async->inode, async->rw, async->bio,

			       async->mirror_num, async->bio_flags,

			       async->bio_offset);

	async->submit_bio_done(async->inode, async->bio, async->mirror_num,

			       async->bio_flags, async->bio_offset);

}



static void run_one_async_free(struct btrfs_work *work)
@@ -844,7 +842,7 @@ static void run_one_async_free(struct btrfs_work *work) 
}



int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,

			int rw, struct bio *bio, int mirror_num,

			struct bio *bio, int mirror_num,

			unsigned long bio_flags,

			u64 bio_offset,

			extent_submit_bio_hook_t *submit_bio_start,
@@ -857,7 +855,6 @@ int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode, 
		return -ENOMEM;



	async->inode = inode;

	async->rw = rw;

	async->bio = bio;

	async->mirror_num = mirror_num;

	async->submit_bio_start = submit_bio_start;
@@ -903,9 +900,8 @@ static int btree_csum_one_bio(struct bio *bio) 
	return ret;

}



static int __btree_submit_bio_start(struct inode *inode, int rw,

				    struct bio *bio, int mirror_num,

				    unsigned long bio_flags,

static int __btree_submit_bio_start(struct inode *inode, struct bio *bio,

				    int mirror_num, unsigned long bio_flags,

				    u64 bio_offset)

{

	/*
@@ -915,7 +911,7 @@ static int __btree_submit_bio_start(struct inode *inode, int rw, 
	return btree_csum_one_bio(bio);

}



static int __btree_submit_bio_done(struct inode *inode, int rw, struct bio *bio,

static int __btree_submit_bio_done(struct inode *inode, struct bio *bio,

				 int mirror_num, unsigned long bio_flags,

				 u64 bio_offset)

{
@@ -925,7 +921,7 @@ static int __btree_submit_bio_done(struct inode *inode, int rw, struct bio *bio, 
	 * when we're called for a write, we're already in the async

	 * submission context.  Just jump into btrfs_map_bio

	 */

	ret = btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, mirror_num, 1);

	ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 1);

	if (ret) {

		bio->bi_error = ret;

		bio_endio(bio);
@@ -944,7 +940,7 @@ static int check_async_write(struct inode *inode, unsigned long bio_flags) 
	return 1;

}



static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,

static int btree_submit_bio_hook(struct inode *inode, struct bio *bio,

				 int mirror_num, unsigned long bio_flags,

				 u64 bio_offset)

{
@@ -960,21 +956,19 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio, 
					  bio, BTRFS_WQ_ENDIO_METADATA);

		if (ret)

			goto out_w_error;

		ret = btrfs_map_bio(BTRFS_I(inode)->root, rw, bio,

				    mirror_num, 0);

		ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 0);

	} else if (!async) {

		ret = btree_csum_one_bio(bio);

		if (ret)

			goto out_w_error;

		ret = btrfs_map_bio(BTRFS_I(inode)->root, rw, bio,

				    mirror_num, 0);

		ret = btrfs_map_bio(BTRFS_I(inode)->root, bio, mirror_num, 0);

	} else {

		/*

		 * kthread helpers are used to submit writes so that

		 * checksumming can happen in parallel across all CPUs

		 */

		ret = btrfs_wq_submit_bio(BTRFS_I(inode)->root->fs_info,

					  inode, rw, bio, mirror_num, 0,

					  inode, bio, mirror_num, 0,

					  bio_offset,

					  __btree_submit_bio_start,

					  __btree_submit_bio_done);

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void btrfs_csum_final(u32 crc, char *result); 
int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,

			enum btrfs_wq_endio_type metadata);

int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,

			int rw, struct bio *bio, int mirror_num,

			struct bio *bio, int mirror_num,

			unsigned long bio_flags, u64 bio_offset,

			extent_submit_bio_hook_t *submit_bio_start,

			extent_submit_bio_hook_t *submit_bio_done);

fs/btrfs/extent_io.c

+5 −7
Original line number Diff line number Diff line
@@ -2418,8 +2418,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, 
	pr_debug("Repair Read Error: submitting new read[%#x] to this_mirror=%d, in_validation=%d\n",

		 read_mode, failrec->this_mirror, failrec->in_validation);



	ret = tree->ops->submit_bio_hook(inode, read_mode, bio,

					 failrec->this_mirror,

	ret = tree->ops->submit_bio_hook(inode, bio, failrec->this_mirror,

					 failrec->bio_flags, 0);

	if (ret) {

		free_io_failure(inode, failrec);
@@ -2740,9 +2739,8 @@ static int __must_check submit_one_bio(struct bio *bio, int mirror_num, 
	bio_get(bio);



	if (tree->ops && tree->ops->submit_bio_hook)

		ret = tree->ops->submit_bio_hook(page->mapping->host,

						 bio->bi_rw, bio, mirror_num,

						 bio_flags, start);

		ret = tree->ops->submit_bio_hook(page->mapping->host, bio,

					   mirror_num, bio_flags, start);

	else

		btrfsic_submit_bio(bio);
@@ -2756,8 +2754,8 @@ static int merge_bio(struct extent_io_tree *tree, struct page *page, 
{

	int ret = 0;

	if (tree->ops && tree->ops->merge_bio_hook)

		ret = tree->ops->merge_bio_hook(bio_op(bio), page, offset, size,

						bio, bio_flags);

		ret = tree->ops->merge_bio_hook(page, offset, size, bio,

						bio_flags);

	BUG_ON(ret < 0);

	return ret;