mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

btrfs: pass struct btrfs_io_geometry to set_io_stripe 

Instead of passing three members of 'struct btrfs_io_geometry' into
set_io_stripe() pass a pointer to the whole structure and then get the needed
members out of btrfs_io_geometry.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2023-12-13 06:43:07 -08:00 committed by David Sterba
parent 89f547c6cc
commit 6edf682236
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/btrfs/volumes.c
View File

@ -6325,19 +6325,22 @@ static u64 btrfs_max_io_len(struct btrfs_chunk_map *map, enum btrfs_map_op op,
return U64_MAX; return U64_MAX;
} }
static int set_io_stripe(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, static int set_io_stripe(struct btrfs_fs_info *fs_info, u64 logical,
u64 logical, u64 *length, struct btrfs_io_stripe *dst, u64 *length, struct btrfs_io_stripe *dst,
struct btrfs_chunk_map *map, u32 stripe_index, struct btrfs_chunk_map *map,
u64 stripe_offset, u64 stripe_nr) struct btrfs_io_geometry *io_geom)
{ {
dst->dev = map->stripes[stripe_index].dev; dst->dev = map->stripes[io_geom->stripe_index].dev;
if (op == BTRFS_MAP_READ && btrfs_need_stripe_tree_update(fs_info, map->type)) if (io_geom->op == BTRFS_MAP_READ &&
btrfs_need_stripe_tree_update(fs_info, map->type))
return btrfs_get_raid_extent_offset(fs_info, logical, length, return btrfs_get_raid_extent_offset(fs_info, logical, length,
map->type, stripe_index, dst); map->type,
io_geom->stripe_index, dst);
dst->physical = map->stripes[stripe_index].physical + dst->physical = map->stripes[io_geom->stripe_index].physical +
stripe_offset + btrfs_stripe_nr_to_offset(stripe_nr); io_geom->stripe_offset +
btrfs_stripe_nr_to_offset(io_geom->stripe_nr);
return 0; return 0;
} }
@ -6633,9 +6636,7 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
*/ */
if (is_single_device_io(fs_info, smap, map, num_alloc_stripes, op, if (is_single_device_io(fs_info, smap, map, num_alloc_stripes, op,
io_geom.mirror_num)) { io_geom.mirror_num)) {
ret = set_io_stripe(fs_info, op, logical, length, smap, map, ret = set_io_stripe(fs_info, logical, length, smap, map, &io_geom);
io_geom.stripe_index, io_geom.stripe_offset,
io_geom.stripe_nr);
if (mirror_num_ret) if (mirror_num_ret)
*mirror_num_ret = io_geom.mirror_num; *mirror_num_ret = io_geom.mirror_num;
*bioc_ret = NULL; *bioc_ret = NULL;
@ -6686,11 +6687,8 @@ int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
* stripe into the bioc. * stripe into the bioc.
*/ */
for (i = 0; i < io_geom.num_stripes; i++) { for (i = 0; i < io_geom.num_stripes; i++) {
ret = set_io_stripe(fs_info, op, logical, length, ret = set_io_stripe(fs_info, logical, length,
&bioc->stripes[i], map, &bioc->stripes[i], map, &io_geom);
io_geom.stripe_index,
io_geom.stripe_offset,
io_geom.stripe_nr);
if (ret < 0) if (ret < 0)
break; break;
io_geom.stripe_index++; io_geom.stripe_index++;