hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: pass the operation to btrfs_bio_alloc

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

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Tested-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Christoph Hellwig 2022-08-06 10:03:22 +02:00 committed by David Sterba
parent d45cfb883b
commit 6b42f5e343
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/compression.c
View File

@ -344,10 +344,8 @@ static struct bio *alloc_compressed_bio(struct compressed_bio *cb, u64 disk_byte
struct bio *bio; struct bio *bio;
int ret; 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_iter.bi_sector = disk_bytenr >> SECTOR_SHIFT;
bio->bi_opf = opf;
bio->bi_private = cb; bio->bi_private = cb;
bio->bi_end_io = endio_func; bio->bi_end_io = endio_func;

6
fs/btrfs/extent_io.c
View File

@ -2626,10 +2626,9 @@ int btrfs_repair_one_sector(struct inode *inode, struct btrfs_bio *failed_bbio,
return -EIO; 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 = btrfs_bio(repair_bio);
repair_bbio->file_offset = start; 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_end_io = failed_bio->bi_end_io;
repair_bio->bi_iter.bi_sector = failrec->logical >> 9; repair_bio->bi_iter.bi_sector = failrec->logical >> 9;
repair_bio->bi_private = failed_bio->bi_private; repair_bio->bi_private = failed_bio->bi_private;
@ -3288,7 +3287,7 @@ static int alloc_new_bio(struct btrfs_inode *inode,
struct bio *bio; struct bio *bio;
int ret; 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 * For compressed page range, its disk_bytenr is always @disk_bytenr
* passed in, no matter if we have added any range into previous bio. * 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->bio = bio;
bio_ctrl->compress_type = compress_type; bio_ctrl->compress_type = compress_type;
bio->bi_end_io = end_io_func; bio->bi_end_io = end_io_func;
bio->bi_opf = opf;
ret = calc_bio_boundaries(bio_ctrl, inode, file_offset); ret = calc_bio_boundaries(bio_ctrl, inode, file_offset);
if (ret < 0) if (ret < 0)
goto error; goto error;

3
fs/btrfs/inode.c
View File

@ -10494,12 +10494,11 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
size_t bytes = min_t(u64, remaining, PAGE_SIZE); size_t bytes = min_t(u64, remaining, PAGE_SIZE);
if (!bio) { if (!bio) {
bio = btrfs_bio_alloc(BIO_MAX_VECS); bio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ);
bio->bi_iter.bi_sector = bio->bi_iter.bi_sector =
(disk_bytenr + cur) >> SECTOR_SHIFT; (disk_bytenr + cur) >> SECTOR_SHIFT;
bio->bi_end_io = btrfs_encoded_read_endio; bio->bi_end_io = btrfs_encoded_read_endio;
bio->bi_private = &priv; bio->bi_private = &priv;
bio->bi_opf = REQ_OP_READ;
} }
if (!bytes || if (!bytes ||

4
fs/btrfs/volumes.c
View File

@ -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 * Just like the underlying bio_alloc_bioset it will not fail as it is backed by
* a mempool. * 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; 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)); btrfs_bio_init(btrfs_bio(bio));
return bio; return bio;
} }

2
fs/btrfs/volumes.h
View File

@ -396,7 +396,7 @@ static inline struct btrfs_bio *btrfs_bio(struct bio *bio)
int __init btrfs_bioset_init(void); int __init btrfs_bioset_init(void);
void __cold btrfs_bioset_exit(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); struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size);
static inline void btrfs_bio_free_csum(struct btrfs_bio *bbio) static inline void btrfs_bio_free_csum(struct btrfs_bio *bbio)