btrfs: silence warning if replace is canceled
When we successfully cancel the device replace, its scrub worker returns -ECANCELED, which is then passed to btrfs_dev_replace_finishing. It cleans up based on the returned status and propagates the same -ECANCELED back the parent function. As of now only user can cancel the replace-scrub, so its ok to silence the warning here. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Родитель
53e62fb5a4
Коммит
49365e6976
|
@ -503,7 +503,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
|
||||||
ret = btrfs_dev_replace_finishing(fs_info, ret);
|
ret = btrfs_dev_replace_finishing(fs_info, ret);
|
||||||
if (ret == -EINPROGRESS) {
|
if (ret == -EINPROGRESS) {
|
||||||
ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS;
|
ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS;
|
||||||
} else {
|
} else if (ret != -ECANCELED) {
|
||||||
WARN_ON(ret);
|
WARN_ON(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -966,7 +966,7 @@ static int btrfs_dev_replace_kthread(void *data)
|
||||||
btrfs_device_get_total_bytes(dev_replace->srcdev),
|
btrfs_device_get_total_bytes(dev_replace->srcdev),
|
||||||
&dev_replace->scrub_progress, 0, 1);
|
&dev_replace->scrub_progress, 0, 1);
|
||||||
ret = btrfs_dev_replace_finishing(fs_info, ret);
|
ret = btrfs_dev_replace_finishing(fs_info, ret);
|
||||||
WARN_ON(ret);
|
WARN_ON(ret && ret != -ECANCELED);
|
||||||
|
|
||||||
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
|
clear_bit(BTRFS_FS_EXCL_OP, &fs_info->flags);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче