diff options
author | Filipe Manana <fdmanana@suse.com> | 2016-04-26 15:36:38 +0100 |
---|---|---|
committer | Filipe Manana <fdmanana@suse.com> | 2016-05-13 01:59:14 +0100 |
commit | 578def7c50f236432ba140d35bb7ca4ef0a1b20b (patch) | |
tree | c6b2e052c0ba5b95d1659f0e95651445951426e1 /fs/btrfs/dev-replace.c | |
parent | 3f9749f6e9edcf8ec569fb542efc3be35e06e84a (diff) | |
download | linux-stable-578def7c50f236432ba140d35bb7ca4ef0a1b20b.tar.gz linux-stable-578def7c50f236432ba140d35bb7ca4ef0a1b20b.tar.bz2 linux-stable-578def7c50f236432ba140d35bb7ca4ef0a1b20b.zip |
Btrfs: don't wait for unrelated IO to finish before relocation
Before the relocation process of a block group starts, it sets the block
group to readonly mode, then flushes all delalloc writes and then finally
it waits for all ordered extents to complete. This last step includes
waiting for ordered extents destinated at extents allocated in other block
groups, making us waste unecessary time.
So improve this by waiting only for ordered extents that fall into the
block group's range.
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.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 26bcb487f958..3371f9e546d9 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -403,7 +403,7 @@ int btrfs_dev_replace_start(struct btrfs_root *root, if (ret) btrfs_err(root->fs_info, "kobj add dev failed %d\n", ret); - btrfs_wait_ordered_roots(root->fs_info, -1); + btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1); /* force writing the updated state information to disk */ trans = btrfs_start_transaction(root, 0); @@ -495,7 +495,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(root->fs_info, -1); + btrfs_wait_ordered_roots(root->fs_info, -1, 0, (u64)-1); trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) { |