diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 14:43:19 -0700 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /fs/btrfs/relocation.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/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 1c29514d8aff..1cfd35cfac76 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4254,12 +4254,11 @@ int btrfs_relocate_block_group(struct btrfs_root *extent_root, u64 group_start) btrfs_info(extent_root->fs_info, "relocating block group %llu flags %llu", rc->block_group->key.objectid, rc->block_group->flags); - ret = btrfs_start_delalloc_roots(fs_info, 0, -1); - if (ret < 0) { - err = ret; - goto out; - } - btrfs_wait_ordered_roots(fs_info, -1); + btrfs_wait_block_group_reservations(rc->block_group); + btrfs_wait_nocow_writers(rc->block_group); + btrfs_wait_ordered_roots(fs_info, -1, + rc->block_group->key.objectid, + rc->block_group->key.offset); while (1) { mutex_lock(&fs_info->cleaner_mutex); |