diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 17:43:19 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 17:43:19 -0400 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /fs/btrfs/dev-replace.c | |
| parent | a88336d13c66fc171f336c6332fcb67339894e08 (diff) | |
| parent | 5f9a8a51d8b95505d8de8b7191ae2ed8c504d4af (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 1f193f742f21..85f12e6e28d2 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
| @@ -385,7 +385,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, char *tgtdev_name, | |||
| 385 | if (ret) | 385 | if (ret) |
| 386 | btrfs_err(fs_info, "kobj add dev failed %d\n", ret); | 386 | btrfs_err(fs_info, "kobj add dev failed %d\n", ret); |
| 387 | 387 | ||
| 388 | btrfs_wait_ordered_roots(fs_info, -1); | 388 | btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1); |
| 389 | 389 | ||
| 390 | /* force writing the updated state information to disk */ | 390 | /* force writing the updated state information to disk */ |
| 391 | trans = btrfs_start_transaction(root, 0); | 391 | trans = btrfs_start_transaction(root, 0); |
| @@ -504,7 +504,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, | |||
| 504 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); | 504 | mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); |
| 505 | return ret; | 505 | return ret; |
| 506 | } | 506 | } |
| 507 | btrfs_wait_ordered_roots(root->fs_info, -1); | 507 | btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1); |
| 508 | 508 | ||
| 509 | trans = btrfs_start_transaction(root, 0); | 509 | trans = btrfs_start_transaction(root, 0); |
| 510 | if (IS_ERR(trans)) { | 510 | if (IS_ERR(trans)) { |