Commit 43c0d1a5 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba

btrfs: remove the unused parameter @len for btrfs_bio_fits_in_stripe()

The parameter @len is not really used in btrfs_bio_fits_in_stripe(),
just remove it.

It got removed in 42034313 ("btrfs: let callers of
btrfs_get_io_geometry pass the em"), before that btrfs_get_chunk_map
utilized it.
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 0044ae11
...@@ -2207,8 +2207,7 @@ int btrfs_bio_fits_in_stripe(struct page *page, size_t size, struct bio *bio, ...@@ -2207,8 +2207,7 @@ int btrfs_bio_fits_in_stripe(struct page *page, size_t size, struct bio *bio,
em = btrfs_get_chunk_map(fs_info, logical, map_length); em = btrfs_get_chunk_map(fs_info, logical, map_length);
if (IS_ERR(em)) if (IS_ERR(em))
return PTR_ERR(em); return PTR_ERR(em);
ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(bio), logical, ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(bio), logical, &geom);
map_length, &geom);
if (ret < 0) if (ret < 0)
goto out; goto out;
...@@ -8197,7 +8196,7 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap, ...@@ -8197,7 +8196,7 @@ static blk_qc_t btrfs_submit_direct(struct inode *inode, struct iomap *iomap,
goto out_err_em; goto out_err_em;
} }
ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(dio_bio), ret = btrfs_get_io_geometry(fs_info, em, btrfs_op(dio_bio),
logical, submit_len, &geom); logical, &geom);
if (ret) { if (ret) {
status = errno_to_blk_status(ret); status = errno_to_blk_status(ret);
goto out_err_em; goto out_err_em;
......
...@@ -6127,17 +6127,17 @@ static bool need_full_stripe(enum btrfs_map_op op) ...@@ -6127,17 +6127,17 @@ static bool need_full_stripe(enum btrfs_map_op op)
* @em: mapping containing the logical extent * @em: mapping containing the logical extent
* @op: type of operation - write or read * @op: type of operation - write or read
* @logical: address that we want to figure out the geometry of * @logical: address that we want to figure out the geometry of
* @len: the length of IO we are going to perform, starting at @logical
* @io_geom: pointer used to return values * @io_geom: pointer used to return values
* *
* Returns < 0 in case a chunk for the given logical address cannot be found, * Returns < 0 in case a chunk for the given logical address cannot be found,
* usually shouldn't happen unless @logical is corrupted, 0 otherwise. * usually shouldn't happen unless @logical is corrupted, 0 otherwise.
*/ */
int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *em, int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *em,
enum btrfs_map_op op, u64 logical, u64 len, enum btrfs_map_op op, u64 logical,
struct btrfs_io_geometry *io_geom) struct btrfs_io_geometry *io_geom)
{ {
struct map_lookup *map; struct map_lookup *map;
u64 len;
u64 offset; u64 offset;
u64 stripe_offset; u64 stripe_offset;
u64 stripe_nr; u64 stripe_nr;
...@@ -6243,7 +6243,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, ...@@ -6243,7 +6243,7 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
em = btrfs_get_chunk_map(fs_info, logical, *length); em = btrfs_get_chunk_map(fs_info, logical, *length);
ASSERT(!IS_ERR(em)); ASSERT(!IS_ERR(em));
ret = btrfs_get_io_geometry(fs_info, em, op, logical, *length, &geom); ret = btrfs_get_io_geometry(fs_info, em, op, logical, &geom);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -446,7 +446,7 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, ...@@ -446,7 +446,7 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
u64 logical, u64 *length, u64 logical, u64 *length,
struct btrfs_bio **bbio_ret); struct btrfs_bio **bbio_ret);
int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *map, int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, struct extent_map *map,
enum btrfs_map_op op, u64 logical, u64 len, enum btrfs_map_op op, u64 logical,
struct btrfs_io_geometry *io_geom); struct btrfs_io_geometry *io_geom);
int btrfs_read_sys_array(struct btrfs_fs_info *fs_info); int btrfs_read_sys_array(struct btrfs_fs_info *fs_info);
int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info); int btrfs_read_chunk_tree(struct btrfs_fs_info *fs_info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment