aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/dev-replace.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2018-03-20 18:44:50 -0400
committerDavid Sterba <dsterba@suse.com>2018-05-28 12:07:25 -0400
commita0fecc23718aa9ef020b8c86173a0b783ed37dcf (patch)
treee26a3fafb050829e607690236c094dc7d4559c1d /fs/btrfs/dev-replace.c
parent149196a2aea682ec9d7d50ec00d779a380deb7aa (diff)
btrfs: remove wrong use of volume_mutex from btrfs_dev_replace_start
The volume mutex does not protect against anything in this case, the comment about scrub is right but not related to locking and looks confusing. The comment in btrfs_find_device_missing_or_by_path is wrong and confusing too. The device_list_mutex is not held here to protect device lookup, but in this case device replace cannot run in parallel with device removal (due to exclusive op protection), so we don't need further locking here. Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r--fs/btrfs/dev-replace.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 9fe7be7fdbef..d097701d494d 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -414,18 +414,13 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,
414 struct btrfs_device *tgt_device = NULL; 414 struct btrfs_device *tgt_device = NULL;
415 struct btrfs_device *src_device = NULL; 415 struct btrfs_device *src_device = NULL;
416 416
417 /* the disk copy procedure reuses the scrub code */
418 mutex_lock(&fs_info->volume_mutex);
419 ret = btrfs_find_device_by_devspec(fs_info, srcdevid, 417 ret = btrfs_find_device_by_devspec(fs_info, srcdevid,
420 srcdev_name, &src_device); 418 srcdev_name, &src_device);
421 if (ret) { 419 if (ret)
422 mutex_unlock(&fs_info->volume_mutex);
423 return ret; 420 return ret;
424 }
425 421
426 ret = btrfs_init_dev_replace_tgtdev(fs_info, tgtdev_name, 422 ret = btrfs_init_dev_replace_tgtdev(fs_info, tgtdev_name,
427 src_device, &tgt_device); 423 src_device, &tgt_device);
428 mutex_unlock(&fs_info->volume_mutex);
429 if (ret) 424 if (ret)
430 return ret; 425 return ret;
431 426