diff options
author | Chris Mason <clm@fb.com> | 2016-05-17 14:24:44 -0700 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-05-17 14:24:44 -0700 |
commit | a88336d13c66fc171f336c6332fcb67339894e08 (patch) | |
tree | 595935ba3afc91dce9be83ca65932f3cf1379436 /fs/btrfs/dev-replace.h | |
parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
parent | 680834ca0ad4e9827048d4bda1e38db69c3dd1e4 (diff) |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/dev-replace.h')
-rw-r--r-- | fs/btrfs/dev-replace.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h index 29e3ef5f96bd..e922b42d91df 100644 --- a/fs/btrfs/dev-replace.h +++ b/fs/btrfs/dev-replace.h @@ -25,8 +25,10 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info); int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info); void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info); -int btrfs_dev_replace_start(struct btrfs_root *root, +int btrfs_dev_replace_by_ioctl(struct btrfs_root *root, struct btrfs_ioctl_dev_replace_args *args); +int btrfs_dev_replace_start(struct btrfs_root *root, char *tgtdev_name, + u64 srcdevid, char *srcdev_name, int read_src); void btrfs_dev_replace_status(struct btrfs_fs_info *fs_info, struct btrfs_ioctl_dev_replace_args *args); int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info, |