diff options
author | Anand Jain <anand.jain@oracle.com> | 2018-02-12 10:33:29 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-03-26 09:09:29 -0400 |
commit | 97282031a64ca72aabf6482f9c32d1bcc931cde2 (patch) | |
tree | 6c07d9b3341255ab04824b7f273f55fc51397a5e /fs/btrfs/dev-replace.c | |
parent | af89e0dc2ce3177d07c4af4028b8a7b88733d07e (diff) |
btrfs: open code btrfs_dev_replace_cancel()
btrfs_dev_replace_cancel() calls __btrfs_dev_replace_cancel() for the
actual cancel so just open code it.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.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 | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 7efbc4d1128b..1ce9528663a6 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
@@ -44,7 +44,6 @@ static void btrfs_dev_replace_update_device_in_mapping_tree( | |||
44 | struct btrfs_fs_info *fs_info, | 44 | struct btrfs_fs_info *fs_info, |
45 | struct btrfs_device *srcdev, | 45 | struct btrfs_device *srcdev, |
46 | struct btrfs_device *tgtdev); | 46 | struct btrfs_device *tgtdev); |
47 | static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info); | ||
48 | static int btrfs_dev_replace_kthread(void *data); | 47 | static int btrfs_dev_replace_kthread(void *data); |
49 | static int btrfs_dev_replace_continue_on_mount(struct btrfs_fs_info *fs_info); | 48 | static int btrfs_dev_replace_continue_on_mount(struct btrfs_fs_info *fs_info); |
50 | 49 | ||
@@ -694,14 +693,7 @@ void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info, | |||
694 | btrfs_dev_replace_unlock(dev_replace, 0); | 693 | btrfs_dev_replace_unlock(dev_replace, 0); |
695 | } | 694 | } |
696 | 695 | ||
697 | int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info, | 696 | u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) |
698 | struct btrfs_ioctl_dev_replace_args *args) | ||
699 | { | ||
700 | args->result = __btrfs_dev_replace_cancel(fs_info); | ||
701 | return 0; | ||
702 | } | ||
703 | |||
704 | static u64 __btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) | ||
705 | { | 697 | { |
706 | struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace; | 698 | struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace; |
707 | struct btrfs_device *tgt_device = NULL; | 699 | struct btrfs_device *tgt_device = NULL; |