Commit 49365e69 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

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: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 53e62fb5

fs/btrfs/dev-replace.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, 
	ret = btrfs_dev_replace_finishing(fs_info, ret);

	if (ret == -EINPROGRESS) {

		ret = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS;

	} else {

	} else if (ret != -ECANCELED) {

		WARN_ON(ret);

	}
@@ -966,7 +966,7 @@ static int btrfs_dev_replace_kthread(void *data) 
			      btrfs_device_get_total_bytes(dev_replace->srcdev),

			      &dev_replace->scrub_progress, 0, 1);

	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);

	return 0;