diff options
| author |   Anand Jain <anand.jain@oracle.com> | 2018-02-12 23:33:29 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-03-26 15:09:29 +0200 |
| commit | 97282031a64ca72aabf6482f9c32d1bcc931cde2 (patch) | |
| tree | 6c07d9b3341255ab04824b7f273f55fc51397a5e /fs/btrfs/ioctl.c | |
| parent | btrfs: Don't hardcode the csum size in btrfs_ordered_sum_size (diff) | |
| download | linux-rng-97282031a64ca72aabf6482f9c32d1bcc931cde2.tar.xz linux-rng-97282031a64ca72aabf6482f9c32d1bcc931cde2.zip | |
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/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 111ee282b777..9082b06f8889 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -4429,7 +4429,8 @@ static long btrfs_ioctl_dev_replace(struct btrfs_fs_info *fs_info, ret = 0; break; case BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL: - ret = btrfs_dev_replace_cancel(fs_info, p); + p->result = __btrfs_dev_replace_cancel(fs_info); + ret = 0; break; default: ret = -EINVAL; |