On 2018年02月12日 23:36, Anand Jain wrote:
> For forensic investigations of issues, we would want to know
> if and when the user cancels the replace.
> 
> Signed-off-by: Anand Jain <anand.j...@oracle.com>
> ---
>  fs/btrfs/dev-replace.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
> index 197be3fe307b..83eb2d32b477 100644
> --- a/fs/btrfs/dev-replace.c
> +++ b/fs/btrfs/dev-replace.c
> @@ -711,6 +711,7 @@ static u64 __btrfs_dev_replace_cancel(struct 
> btrfs_fs_info *fs_info)
>  {
>       struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
>       struct btrfs_device *tgt_device = NULL;
> +     struct btrfs_device *src_device = NULL;
>       struct btrfs_trans_handle *trans;
>       struct btrfs_root *root = fs_info->tree_root;
>       u64 result;
> @@ -732,6 +733,7 @@ static u64 __btrfs_dev_replace_cancel(struct 
> btrfs_fs_info *fs_info)
>       case BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED:
>               result = BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR;
>               tgt_device = dev_replace->tgtdev;
> +             src_device = dev_replace->srcdev;
>               dev_replace->tgtdev = NULL;
>               dev_replace->srcdev = NULL;
>               break;
> @@ -749,6 +751,11 @@ static u64 __btrfs_dev_replace_cancel(struct 
> btrfs_fs_info *fs_info)
>       }
>       ret = btrfs_commit_transaction(trans);
>       WARN_ON(ret);
> +
> +     btrfs_info(fs_info, "dev_replace from %s (devid %llu) to %s canceled",
> +                btrfs_dev_name(src_device), src_device->devid,
> +                rcu_str_deref(tgt_device->name));

The behavior is quite good.

Although I'm wondering why for @src_device we use btrfs_dev_name() but
rcu_str_deref() for @tgt_device?

Thanks,
Qu


> +
>       if (tgt_device)
>               btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
>  
> 

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to