| Message ID | 20230330063059.1574380-8-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/21] btrfs: mark extent_buffer_under_io static | expand |
On 2023/3/30 14:30, Christoph Hellwig wrote: > Given that read recovery for data I/O is handled in the storage layer, > the mirror_num argument to btrfs_submit_compressed_read is always 0, > so remove it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/compression.c | 4 ++-- > fs/btrfs/compression.h | 2 +- > fs/btrfs/extent_io.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c > index 44c4276741ceda..8ca152164c11bf 100644 > --- a/fs/btrfs/compression.c > +++ b/fs/btrfs/compression.c > @@ -479,7 +479,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, > * After the compressed pages are read, we copy the bytes into the > * bio we were passed and then call the bio end_io calls > */ > -void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num) > +void btrfs_submit_compressed_read(struct btrfs_bio *bbio) > { > struct btrfs_inode *inode = bbio->inode; > struct btrfs_fs_info *fs_info = inode->root->fs_info; > @@ -545,7 +545,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num) > if (memstall) > psi_memstall_leave(&pflags); > > - btrfs_submit_bio(&cb->bbio, mirror_num); > + btrfs_submit_bio(&cb->bbio, 0); > return; > > out_free_compressed_pages: > diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h > index 5d5146e72a860b..8ba8e62b096061 100644 > --- a/fs/btrfs/compression.h > +++ b/fs/btrfs/compression.h > @@ -94,7 +94,7 @@ void btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, > blk_opf_t write_flags, > struct cgroup_subsys_state *blkcg_css, > bool writeback); > -void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num); > +void btrfs_submit_compressed_read(struct btrfs_bio *bbio); > > unsigned int btrfs_compress_str2level(unsigned int type, const char *str); > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index 8e709b44fa57ec..4d412efe32c6b2 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -126,7 +126,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) > > if (btrfs_op(&bbio->bio) == BTRFS_MAP_READ && > bio_ctrl->compress_type != BTRFS_COMPRESS_NONE) > - btrfs_submit_compressed_read(bbio, 0); > + btrfs_submit_compressed_read(bbio); > else > btrfs_submit_bio(bbio, 0); >
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 44c4276741ceda..8ca152164c11bf 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -479,7 +479,7 @@ static noinline int add_ra_bio_pages(struct inode *inode, * After the compressed pages are read, we copy the bytes into the * bio we were passed and then call the bio end_io calls */ -void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num) +void btrfs_submit_compressed_read(struct btrfs_bio *bbio) { struct btrfs_inode *inode = bbio->inode; struct btrfs_fs_info *fs_info = inode->root->fs_info; @@ -545,7 +545,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num) if (memstall) psi_memstall_leave(&pflags); - btrfs_submit_bio(&cb->bbio, mirror_num); + btrfs_submit_bio(&cb->bbio, 0); return; out_free_compressed_pages: diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h index 5d5146e72a860b..8ba8e62b096061 100644 --- a/fs/btrfs/compression.h +++ b/fs/btrfs/compression.h @@ -94,7 +94,7 @@ void btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start, blk_opf_t write_flags, struct cgroup_subsys_state *blkcg_css, bool writeback); -void btrfs_submit_compressed_read(struct btrfs_bio *bbio, int mirror_num); +void btrfs_submit_compressed_read(struct btrfs_bio *bbio); unsigned int btrfs_compress_str2level(unsigned int type, const char *str); diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 8e709b44fa57ec..4d412efe32c6b2 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -126,7 +126,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) if (btrfs_op(&bbio->bio) == BTRFS_MAP_READ && bio_ctrl->compress_type != BTRFS_COMPRESS_NONE) - btrfs_submit_compressed_read(bbio, 0); + btrfs_submit_compressed_read(bbio); else btrfs_submit_bio(bbio, 0);