On Tue, Jan 30, 2018 at 02:28:30PM +0800, Anand Jain wrote:
> Obtain the stripes info from the map directly and so no need
> to pass it as an argument.
> 
> Signed-off-by: Anand Jain <anand.j...@oracle.com>
> ---
>  fs/btrfs/volumes.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index f7147740b68e..9c9d987838c2 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -5252,13 +5252,22 @@ int btrfs_is_parity_mirror(struct btrfs_fs_info 
> *fs_info, u64 logical, u64 len)
>  }
>  
>  static int find_live_mirror(struct btrfs_fs_info *fs_info,
> -                         struct map_lookup *map, int first, int num,
> +                         struct map_lookup *map, int first,
>                           int optimal, int dev_replace_is_ongoing)
>  {
>       int i;
> +     int num;

Can you please rename it to something more descriptive? Eg. num_stripes.

>       int tolerance;
>       struct btrfs_device *srcdev;
>  
> +     ASSERT((map->type &
> +              (BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_RAID10)));
> +
> +     if (map->type & BTRFS_BLOCK_GROUP_RAID10)
> +             num = map->sub_stripes;
> +     else
> +             num = map->num_stripes;
> +
>       if (dev_replace_is_ongoing &&
>           fs_info->dev_replace.cont_reading_from_srcdev_mode ==
>            BTRFS_DEV_REPLACE_ITEM_CONT_READING_FROM_SRCDEV_MODE_AVOID)
> @@ -5812,7 +5821,6 @@ static int __btrfs_map_block(struct btrfs_fs_info 
> *fs_info,
>                       stripe_index = mirror_num - 1;
>               else {
>                       stripe_index = find_live_mirror(fs_info, map, 0,
> -                                         map->num_stripes,
>                                           current->pid % map->num_stripes,
>                                           dev_replace_is_ongoing);
>                       mirror_num = stripe_index + 1;
> @@ -5841,7 +5849,7 @@ static int __btrfs_map_block(struct btrfs_fs_info 
> *fs_info,
>                       int old_stripe_index = stripe_index;
>                       stripe_index = find_live_mirror(fs_info, map,
>                                             stripe_index,
> -                                           map->sub_stripes, stripe_index +
> +                                           stripe_index +
>                                             current->pid % map->sub_stripes,
>                                             dev_replace_is_ongoing);
>                       mirror_num = stripe_index - old_stripe_index + 1;
> -- 
> 2.7.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to