diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
| commit | 1724c7c0c9494dcbdd7f630f29e1e8427cb231d1 (patch) | |
| tree | d7c7ad032289cdf0633feee4bd6ec5800b666ca7 /fs/btrfs/dev-replace.c | |
| parent | drm/atomic: Handle -EDEADLK with out-fences correctly (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-dev-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.tar.xz linux-dev-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.zip | |
Merge origin/master into drm-misc-fixes
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
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 5fe1ca8abc70..bee3edeea7a3 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -388,7 +388,7 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info, if (ret) btrfs_err(fs_info, "kobj add dev failed %d", ret); - btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1); + btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1); /* force writing the updated state information to disk */ trans = btrfs_start_transaction(root, 0); @@ -507,7 +507,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, mutex_unlock(&dev_replace->lock_finishing_cancel_unmount); return ret; } - btrfs_wait_ordered_roots(fs_info, -1, 0, (u64)-1); + btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1); trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { |