1 files changed, 15 insertions, 8 deletions

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 0bf41f8b1e23..ca6a3a3b6b6c 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -417,9 +417,15 @@ int btrfs_dev_replace_start(struct btrfs_root *root,
                               &dev_replace->scrub_progress, 0, 1);
 
         ret = btrfs_dev_replace_finishing(root->fs_info, ret);
-        WARN_ON(ret);
+        /* don't warn if EINPROGRESS, someone else might be running scrub */
+        if (ret == -EINPROGRESS) {
+                args->result = BTRFS_IOCTL_DEV_REPLACE_RESULT_SCRUB_INPROGRESS;
+                ret = 0;
+        } else {
+                WARN_ON(ret);
+        }
 
-        return 0;
+        return ret;
 
 leave:
         dev_replace->srcdev = NULL;
@@ -537,7 +543,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
                         btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device);
                 mutex_unlock(&dev_replace->lock_finishing_cancel_unmount);
 
-                return 0;
+                return scrub_ret;
         }
 
         printk_in_rcu(KERN_INFO
@@ -566,15 +572,11 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
         list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);
         fs_info->fs_devices->rw_devices++;
 
-        /* replace the sysfs entry */
-        btrfs_kobj_rm_device(fs_info, src_device);
-        btrfs_kobj_add_device(fs_info, tgt_device);
-
         btrfs_dev_replace_unlock(dev_replace);
 
         btrfs_rm_dev_replace_blocked(fs_info);
 
-        btrfs_rm_dev_replace_srcdev(fs_info, src_device);
+        btrfs_rm_dev_replace_remove_srcdev(fs_info, src_device);
 
         btrfs_rm_dev_replace_unblocked(fs_info);
 
@@ -589,6 +591,11 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
         mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
         mutex_unlock(&uuid_mutex);
 
+        /* replace the sysfs entry */
+        btrfs_kobj_rm_device(fs_info, src_device);
+        btrfs_kobj_add_device(fs_info, tgt_device);
+        btrfs_rm_dev_replace_free_srcdev(fs_info, src_device);
+
         /* write back the superblocks */
         trans = btrfs_start_transaction(root, 0);
         if (!IS_ERR(trans))