diff options
author | Nikolay Borisov <nborisov@suse.com> | 2018-07-20 12:37:51 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 07:12:57 -0400 |
commit | 4f5ad7bd6315528ed50a11d53c66854a5d16425b (patch) | |
tree | 286a20070d43f4c1a698ad7b0c4ebde76a2d226c /fs/btrfs/dev-replace.c | |
parent | d6507cf1e2dfa4f6888cd90e4c9a307f7ac9b383 (diff) |
btrfs: Remove fs_info from btrfs_destroy_dev_replace_tgtdev
This function is always passed a well-formed tgtdevice so the fs_info
can be referenced from there.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
-rw-r--r-- | fs/btrfs/dev-replace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index dd17a4d7bea2..5a72f9933e58 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -506,7 +506,7 @@ leave: | |||
506 | dev_replace->srcdev = NULL; | 506 | dev_replace->srcdev = NULL; |
507 | dev_replace->tgtdev = NULL; | 507 | dev_replace->tgtdev = NULL; |
508 | btrfs_dev_replace_write_unlock(dev_replace); | 508 | btrfs_dev_replace_write_unlock(dev_replace); |
509 | btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device); | 509 | btrfs_destroy_dev_replace_tgtdev(tgt_device); |
510 | return ret; | 510 | return ret; |
511 | } | 511 | } |
512 | 512 | ||
@@ -632,7 +632,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
632 | mutex_unlock(&fs_info->fs_devices->device_list_mutex); | 632 | mutex_unlock(&fs_info->fs_devices->device_list_mutex); |
633 | btrfs_rm_dev_replace_blocked(fs_info); | 633 | btrfs_rm_dev_replace_blocked(fs_info); |
634 | if (tgt_device) | 634 | if (tgt_device) |
635 | btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device); | 635 | btrfs_destroy_dev_replace_tgtdev(tgt_device); |
636 | btrfs_rm_dev_replace_unblocked(fs_info); | 636 | btrfs_rm_dev_replace_unblocked(fs_info); |
637 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); | 637 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); |
638 | 638 | ||
@@ -821,7 +821,7 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) | |||
821 | btrfs_dev_name(tgt_device)); | 821 | btrfs_dev_name(tgt_device)); |
822 | 822 | ||
823 | if (tgt_device) | 823 | if (tgt_device) |
824 | btrfs_destroy_dev_replace_tgtdev(fs_info, tgt_device); | 824 | btrfs_destroy_dev_replace_tgtdev(tgt_device); |
825 | 825 | ||
826 | leave: | 826 | leave: |
827 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); | 827 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); |