mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
btrfs: remove the fs_info argument to btrfs_submit_bio
btrfs_submit_bio can derive it trivially from bbio->inode, so stop bothering in the callers. Reviewed-by: Josef Bacik <josef@toxicpanda.com> Reviewed-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:
parent
48253076c3
commit
285599b6fe
|
@ -155,7 +155,7 @@ static void btrfs_end_repair_bio(struct btrfs_bio *repair_bbio,
|
|||
goto done;
|
||||
}
|
||||
|
||||
btrfs_submit_bio(fs_info, &repair_bbio->bio, mirror);
|
||||
btrfs_submit_bio(&repair_bbio->bio, mirror);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -223,7 +223,7 @@ static struct btrfs_failed_bio *repair_one_sector(struct btrfs_bio *failed_bbio,
|
|||
|
||||
mirror = next_repair_mirror(fbio, failed_bbio->mirror_num);
|
||||
btrfs_debug(fs_info, "submitting repair read to mirror %d", mirror);
|
||||
btrfs_submit_bio(fs_info, repair_bio, mirror);
|
||||
btrfs_submit_bio(repair_bio, mirror);
|
||||
return fbio;
|
||||
}
|
||||
|
||||
|
@ -600,10 +600,10 @@ static bool btrfs_wq_submit_bio(struct btrfs_bio *bbio,
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool btrfs_submit_chunk(struct btrfs_fs_info *fs_info, struct bio *bio,
|
||||
int mirror_num)
|
||||
static bool btrfs_submit_chunk(struct bio *bio, int mirror_num)
|
||||
{
|
||||
struct btrfs_bio *bbio = btrfs_bio(bio);
|
||||
struct btrfs_fs_info *fs_info = bbio->inode->root->fs_info;
|
||||
struct btrfs_bio *orig_bbio = bbio;
|
||||
u64 logical = bio->bi_iter.bi_sector << 9;
|
||||
u64 length = bio->bi_iter.bi_size;
|
||||
|
@ -676,9 +676,9 @@ static bool btrfs_submit_chunk(struct btrfs_fs_info *fs_info, struct bio *bio,
|
|||
return true;
|
||||
}
|
||||
|
||||
void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror_num)
|
||||
void btrfs_submit_bio(struct bio *bio, int mirror_num)
|
||||
{
|
||||
while (!btrfs_submit_chunk(fs_info, bio, mirror_num))
|
||||
while (!btrfs_submit_chunk(bio, mirror_num))
|
||||
;
|
||||
}
|
||||
|
||||
|
|
|
@ -88,8 +88,7 @@ static inline void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status)
|
|||
/* Bio only refers to one ordered extent. */
|
||||
#define REQ_BTRFS_ONE_ORDERED REQ_DRV
|
||||
|
||||
void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio,
|
||||
int mirror_num);
|
||||
void btrfs_submit_bio(struct bio *bio, int mirror_num);
|
||||
int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
|
||||
u64 length, u64 logical, struct page *page,
|
||||
unsigned int pg_offset, int mirror_num);
|
||||
|
|
|
@ -402,7 +402,7 @@ blk_status_t btrfs_submit_compressed_write(struct btrfs_inode *inode, u64 start,
|
|||
|
||||
if (submit) {
|
||||
ASSERT(bio->bi_iter.bi_size);
|
||||
btrfs_submit_bio(fs_info, bio, 0);
|
||||
btrfs_submit_bio(bio, 0);
|
||||
bio = NULL;
|
||||
}
|
||||
cond_resched();
|
||||
|
@ -698,7 +698,7 @@ void btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
|
|||
btrfs_bio(comp_bio)->file_offset = file_offset;
|
||||
|
||||
ASSERT(comp_bio->bi_iter.bi_size);
|
||||
btrfs_submit_bio(fs_info, comp_bio, mirror_num);
|
||||
btrfs_submit_bio(comp_bio, mirror_num);
|
||||
return;
|
||||
|
||||
fail:
|
||||
|
|
|
@ -702,7 +702,7 @@ int btrfs_validate_metadata_buffer(struct btrfs_bio *bbio,
|
|||
void btrfs_submit_metadata_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)
|
||||
{
|
||||
bio->bi_opf |= REQ_META;
|
||||
btrfs_submit_bio(inode->root->fs_info, bio, mirror_num);
|
||||
btrfs_submit_bio(bio, mirror_num);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MIGRATION
|
||||
|
|
|
@ -2697,14 +2697,12 @@ blk_status_t btrfs_extract_ordered_extent(struct btrfs_bio *bbio)
|
|||
|
||||
void btrfs_submit_data_write_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)
|
||||
{
|
||||
btrfs_submit_bio(inode->root->fs_info, bio, mirror_num);
|
||||
btrfs_submit_bio(bio, mirror_num);
|
||||
}
|
||||
|
||||
void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
|
||||
int mirror_num, enum btrfs_compression_type compress_type)
|
||||
{
|
||||
struct btrfs_fs_info *fs_info = inode->root->fs_info;
|
||||
|
||||
if (compress_type != BTRFS_COMPRESS_NONE) {
|
||||
/*
|
||||
* btrfs_submit_compressed_read will handle completing the bio
|
||||
|
@ -2714,7 +2712,7 @@ void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
|
|||
return;
|
||||
}
|
||||
|
||||
btrfs_submit_bio(fs_info, bio, mirror_num);
|
||||
btrfs_submit_bio(bio, mirror_num);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -7795,7 +7793,7 @@ static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio,
|
|||
dip->bytes = bio->bi_iter.bi_size;
|
||||
|
||||
dio_data->submitted += bio->bi_iter.bi_size;
|
||||
btrfs_submit_bio(btrfs_sb(iter->inode->i_sb), bio, 0);
|
||||
btrfs_submit_bio(bio, 0);
|
||||
}
|
||||
|
||||
static const struct iomap_ops btrfs_dio_iomap_ops = {
|
||||
|
@ -9960,7 +9958,6 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
|
|||
u64 file_offset, u64 disk_bytenr,
|
||||
u64 disk_io_size, struct page **pages)
|
||||
{
|
||||
struct btrfs_fs_info *fs_info = inode->root->fs_info;
|
||||
struct btrfs_encoded_read_private priv = {
|
||||
.inode = inode,
|
||||
.file_offset = file_offset,
|
||||
|
@ -9990,7 +9987,7 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
|
|||
if (!bytes ||
|
||||
bio_add_page(bio, pages[i], bytes, 0) < bytes) {
|
||||
atomic_inc(&priv.pending);
|
||||
btrfs_submit_bio(fs_info, bio, 0);
|
||||
btrfs_submit_bio(bio, 0);
|
||||
bio = NULL;
|
||||
continue;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue