On 2018年02月12日 23:36, Anand Jain wrote:
> btrfs_init_dev_replace_tgtdev_for_resume()  initializes replace
> target device in few simple steps, so do it at the parent function.
> Moreover, there isn't any other caller so just open code it.
> 
> Signed-off-by: Anand Jain <anand.j...@oracle.com>

Reviewed-by: Qu Wenruo <w...@suse.com>

Thanks,
Qu

> ---
>  fs/btrfs/dev-replace.c | 10 ++++++++--
>  fs/btrfs/volumes.c     | 13 -------------
>  fs/btrfs/volumes.h     |  2 --
>  3 files changed, 8 insertions(+), 17 deletions(-)
> 
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 7efbc4d1128b..197be3fe307b 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -174,8 +174,14 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
>                       }
>                       set_bit(BTRFS_DEV_STATE_REPLACE_TGT,
>                               &dev_replace->tgtdev->dev_state);
> -                     btrfs_init_dev_replace_tgtdev_for_resume(fs_info,
> -                             dev_replace->tgtdev);
> +
> +                     WARN_ON(fs_info->fs_devices->rw_devices == 0);
> +                     dev_replace->tgtdev->io_width = fs_info->sectorsize;
> +                     dev_replace->tgtdev->io_align = fs_info->sectorsize;
> +                     dev_replace->tgtdev->sector_size = fs_info->sectorsize;
> +                     dev_replace->tgtdev->fs_info = fs_info;
> +                     set_bit(BTRFS_DEV_STATE_IN_FS_METADATA,
> +                             &dev_replace->tgtdev->dev_state);
>               }
>               break;
>       }
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index bbdcf50cd65b..28c385d6419a 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -2681,19 +2681,6 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info 
> *fs_info,
>       return ret;
>  }
>  
> -void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
> -                                           struct btrfs_device *tgtdev)
> -{
> -     u32 sectorsize = fs_info->sectorsize;
> -
> -     WARN_ON(fs_info->fs_devices->rw_devices == 0);
> -     tgtdev->io_width = sectorsize;
> -     tgtdev->io_align = sectorsize;
> -     tgtdev->sector_size = sectorsize;
> -     tgtdev->fs_info = fs_info;
> -     set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &tgtdev->dev_state);
> -}
> -
>  static noinline int btrfs_update_device(struct btrfs_trans_handle *trans,
>                                       struct btrfs_device *device)
>  {
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index 7281f55dea05..c69d8b4eb4c6 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -483,8 +483,6 @@ void btrfs_rm_dev_replace_free_srcdev(struct 
> btrfs_fs_info *fs_info,
>                                     struct btrfs_device *srcdev);
>  void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
>                                     struct btrfs_device *tgtdev);
> -void btrfs_init_dev_replace_tgtdev_for_resume(struct btrfs_fs_info *fs_info,
> -                                           struct btrfs_device *tgtdev);
>  void btrfs_scratch_superblocks(struct block_device *bdev, const char 
> *device_path);
>  int btrfs_is_parity_mirror(struct btrfs_fs_info *fs_info,
>                          u64 logical, u64 len);
> 

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to