diff options
| author |   Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-02-28 14:35:09 -0800 |
| commit | e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b (patch) | |
| tree | e0a2b8e21ed58952c13e6d1dc3646eecd1ea211e /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'for-chris-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.11 (diff) | |
| parent | btrfs: add dummy callback for readpage_io_failed and drop checks (diff) | |
| download | linux-dev-e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b.tar.xz linux-dev-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.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 5de280b9ad73..e653921f05d9 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -304,8 +304,9 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info) dev_replace->cursor_left_last_write_of_item; } -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) { struct btrfs_root *root = fs_info->dev_root; struct btrfs_trans_handle *trans; |