diff options
author | Chris Mason | 2017-02-28 23:35:09 +0100 |
---|---|---|
committer | Chris Mason | 2017-02-28 23:35:09 +0100 |
commit | e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b (patch) | |
tree | e0a2b8e21ed58952c13e6d1dc3646eecd1ea211e /fs/btrfs/dev-replace.h | |
parent | Merge branch 'for-chris-4.11' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | btrfs: add dummy callback for readpage_io_failed and drop checks (diff) | |
download | kernel-qcow2-linux-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.tar.gz kernel-qcow2-linux-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.tar.xz kernel-qcow2-linux-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.zip |
Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11
Diffstat (limited to 'fs/btrfs/dev-replace.h')
-rw-r--r-- | fs/btrfs/dev-replace.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h index 54ea12bda15b..f94a76844ae7 100644 --- a/fs/btrfs/dev-replace.h +++ b/fs/btrfs/dev-replace.h @@ -27,8 +27,9 @@ int btrfs_run_dev_replace(struct btrfs_trans_handle *trans, void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info); int btrfs_dev_replace_by_ioctl(struct btrfs_fs_info *fs_info, struct btrfs_ioctl_dev_replace_args *args); -int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, char *tgtdev_name, - u64 srcdevid, char *srcdev_name, int read_src); +int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, + const char *tgtdev_name, u64 srcdevid, const 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, |