| Message ID | 20220806080330.3823644-4-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] btrfs: don't call bioset_integrity_create for btrfs_bioset | expand |
On 8/6/22 16:03, Christoph Hellwig wrote: > Pass the operation to btrfs_bio_alloc, matching what bio_alloc_bioset > set does. Got it. bio_alloc_bioset() bio_init() :: bio->bi_opf = opf; Reviewed-by: Anand Jain <anand.jain@oracle.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Nikolay Borisov <nborisov@suse.com> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Tested-by: Nikolay Borisov <nborisov@suse.com> > Tested-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > --- > fs/btrfs/compression.c | 3 +-- > fs/btrfs/extent_io.c | 6 ++---- > fs/btrfs/inode.c | 3 +-- > fs/btrfs/volumes.c | 4 ++-- > fs/btrfs/volumes.h | 2 +- > 5 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index f3df9b9b43816..e124096eacddd 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -344,10 +344,9 @@ 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; > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 068208244d925..fae8c1899226b 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -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; > @@ -3266,7 +3265,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. > @@ -3278,7 +3277,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; > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 8cdb173331c7c..dc2cf58095c2e 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -10489,12 +10489,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 || > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index bb614bb890709..a73bac7f42624 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -6624,11 +6624,11 @@ static inline void btrfs_bio_init(struct btrfs_bio *bbio) > * Just like the underlying bio_alloc_bioset it will no 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, unsigned int 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; > } > diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h > index fb57b50fb60b1..bd108c7ed1ac3 100644 > --- a/fs/btrfs/volumes.h > +++ b/fs/btrfs/volumes.h > @@ -393,7 +393,7 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio) > return container_of(bio, struct btrfs_bio, bio); > } > > -struct bio *btrfs_bio_alloc(unsigned int nr_vecs); > +struct bio *btrfs_bio_alloc(unsigned int nr_vecs, unsigned int 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)
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index f3df9b9b43816..e124096eacddd 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -344,10 +344,9 @@ 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; diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 068208244d925..fae8c1899226b 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -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; @@ -3266,7 +3265,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. @@ -3278,7 +3277,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; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 8cdb173331c7c..dc2cf58095c2e 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -10489,12 +10489,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 || diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index bb614bb890709..a73bac7f42624 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6624,11 +6624,11 @@ static inline void btrfs_bio_init(struct btrfs_bio *bbio) * Just like the underlying bio_alloc_bioset it will no 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, unsigned int 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; } diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index fb57b50fb60b1..bd108c7ed1ac3 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -393,7 +393,7 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio) return container_of(bio, struct btrfs_bio, bio); } -struct bio *btrfs_bio_alloc(unsigned int nr_vecs); +struct bio *btrfs_bio_alloc(unsigned int nr_vecs, unsigned int 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)