Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebcc3263 authored by David Sterba's avatar David Sterba
Browse files

btrfs: open-code bio_set_op_attrs 



The helper is trivial and marked as deprecated.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cc5e31a4

fs/btrfs/check-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -1629,7 +1629,7 @@ static int btrfsic_read_block(struct btrfsic_state *state, 
		bio = btrfs_io_bio_alloc(num_pages - i);

		bio_set_dev(bio, block_ctx->dev->bdev);

		bio->bi_iter.bi_sector = dev_bytenr >> 9;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;



		for (j = i; j < num_pages; j++) {

			ret = bio_add_page(bio, block_ctx->pagev[j],

fs/btrfs/compression.c

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
	cb->len = bio->bi_iter.bi_size;



	comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);

	bio_set_op_attrs (comp_bio, REQ_OP_READ, 0);

	comp_bio->bi_opf = REQ_OP_READ;

	comp_bio->bi_private = cb;

	comp_bio->bi_end_io = end_compressed_bio_read;

	refcount_set(&cb->pending_bios, 1);
@@ -656,7 +656,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio, 
			}



			comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);

			bio_set_op_attrs(comp_bio, REQ_OP_READ, 0);

			comp_bio->bi_opf = REQ_OP_READ;

			comp_bio->bi_private = cb;

			comp_bio->bi_end_io = end_compressed_bio_read;

fs/btrfs/extent_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2398,7 +2398,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, 
				      start - page_offset(page),

				      (int)phy_offset, failed_bio->bi_end_io,

				      NULL);

	bio_set_op_attrs(bio, REQ_OP_READ, read_mode);

	bio->bi_opf = REQ_OP_READ | read_mode;



	btrfs_debug(btrfs_sb(inode->i_sb),

		"Repair Read Error: submitting new read[%#x] to this_mirror=%d, in_validation=%d",

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -7861,7 +7861,7 @@ static blk_status_t dio_read_error(struct inode *inode, struct bio *failed_bio, 
	isector >>= inode->i_sb->s_blocksize_bits;

	bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,

				pgoff, isector, repair_endio, repair_arg);

	bio_set_op_attrs(bio, REQ_OP_READ, read_mode);

	bio->bi_opf = REQ_OP_READ | read_mode;



	btrfs_debug(BTRFS_I(inode)->root->fs_info,

		    "repair DIO read error: submitting new dio read[%#x] to this_mirror=%d, in_validation=%d",

fs/btrfs/raid56.c

+5 −5
Original line number Diff line number Diff line
@@ -1330,7 +1330,7 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) 


		bio->bi_private = rbio;

		bio->bi_end_io = raid_write_end_io;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

		bio->bi_opf = REQ_OP_WRITE;



		submit_bio(bio);

	}
@@ -1586,7 +1586,7 @@ static int raid56_rmw_stripe(struct btrfs_raid_bio *rbio) 


		bio->bi_private = rbio;

		bio->bi_end_io = raid_rmw_end_io;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;



		btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
@@ -2130,7 +2130,7 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio) 


		bio->bi_private = rbio;

		bio->bi_end_io = raid_recover_end_io;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;



		btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);
@@ -2502,7 +2502,7 @@ static noinline void finish_parity_scrub(struct btrfs_raid_bio *rbio, 


		bio->bi_private = rbio;

		bio->bi_end_io = raid_write_end_io;

		bio_set_op_attrs(bio, REQ_OP_WRITE, 0);

		bio->bi_opf = REQ_OP_WRITE;



		submit_bio(bio);

	}
@@ -2684,7 +2684,7 @@ static void raid56_parity_scrub_stripe(struct btrfs_raid_bio *rbio) 


		bio->bi_private = rbio;

		bio->bi_end_io = raid56_parity_scrub_end_io;

		bio_set_op_attrs(bio, REQ_OP_READ, 0);

		bio->bi_opf = REQ_OP_READ;



		btrfs_bio_wq_end_io(rbio->fs_info, bio, BTRFS_WQ_ENDIO_RAID56);