Commit 6b42f5e3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: pass the operation to btrfs_bio_alloc 



Pass the operation to btrfs_bio_alloc, matching what bio_alloc_bioset
set does.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Tested-by: default avatarNikolay Borisov <nborisov@suse.com>
Tested-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.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 d45cfb88

fs/btrfs/compression.c

+1 −3
Original line number Diff line number Diff line
@@ -344,10 +344,8 @@ static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_byte 
	struct bio *bio;

	int ret;



	bio = btrfs_bio_alloc(BIO_MAX_VECS);



	bio = btrfs_bio_alloc(BIO_MAX_VECS, opf);

	bio->bi_iter.bi_sector = disk_bytenr >> SECTOR_SHIFT;

	bio->bi_opf = opf;

	bio->bi_private = cb;

	bio->bi_end_io = endio_func;

fs/btrfs/extent_io.c

+2 −4
Original line number Diff line number Diff line
@@ -2626,10 +2626,9 @@ int btrfs_repair_one_sector(struct inode *inode, struct btrfs_bio *failed_bbio, 
		return -EIO;

	}



	repair_bio = btrfs_bio_alloc(1);

	repair_bio = btrfs_bio_alloc(1, REQ_OP_READ);

	repair_bbio = btrfs_bio(repair_bio);

	repair_bbio->file_offset = start;

	repair_bio->bi_opf = REQ_OP_READ;

	repair_bio->bi_end_io = failed_bio->bi_end_io;

	repair_bio->bi_iter.bi_sector = failrec->logical >> 9;

	repair_bio->bi_private = failed_bio->bi_private;
@@ -3288,7 +3287,7 @@ static int alloc_new_bio(struct btrfs_inode *inode, 
	struct bio *bio;

	int ret;



	bio = btrfs_bio_alloc(BIO_MAX_VECS);

	bio = btrfs_bio_alloc(BIO_MAX_VECS, opf);

	/*

	 * For compressed page range, its disk_bytenr is always @disk_bytenr

	 * passed in, no matter if we have added any range into previous bio.
@@ -3300,7 +3299,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_opf = opf;

	ret = calc_bio_boundaries(bio_ctrl, inode, file_offset);

	if (ret < 0)

		goto error;

fs/btrfs/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -10494,12 +10494,11 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode, 
			size_t bytes = min_t(u64, remaining, PAGE_SIZE);



			if (!bio) {

				bio = btrfs_bio_alloc(BIO_MAX_VECS);

				bio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ);

				bio->bi_iter.bi_sector =

					(disk_bytenr + cur) >> SECTOR_SHIFT;

				bio->bi_end_io = btrfs_encoded_read_endio;

				bio->bi_private = &priv;

				bio->bi_opf = REQ_OP_READ;

			}



			if (!bytes ||

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -6630,11 +6630,11 @@ static inline void btrfs_bio_init(struct btrfs_bio *bbio) 
 * Just like the underlying bio_alloc_bioset it will not fail as it is backed by

 * a mempool.

 */

struct bio *btrfs_bio_alloc(unsigned int nr_vecs)

struct bio *btrfs_bio_alloc(unsigned int nr_vecs, blk_opf_t opf)

{

	struct bio *bio;



	bio = bio_alloc_bioset(NULL, nr_vecs, 0, GFP_NOFS, &btrfs_bioset);

	bio = bio_alloc_bioset(NULL, nr_vecs, opf, GFP_NOFS, &btrfs_bioset);

	btrfs_bio_init(btrfs_bio(bio));

	return bio;

}

fs/btrfs/volumes.h

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio) 
int __init btrfs_bioset_init(void);

void __cold btrfs_bioset_exit(void);



struct bio *btrfs_bio_alloc(unsigned int nr_vecs);

struct bio *btrfs_bio_alloc(unsigned int nr_vecs, blk_opf_t opf);

struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);



static inline void btrfs_bio_free_csum(struct btrfs_bio *bbio)