1 files changed, 6 insertions, 7 deletions

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 08ef890deca6..1cfd35cfac76 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2418,7 +2418,7 @@ again:
         }
 out:
         if (ret) {
-                btrfs_std_error(root->fs_info, ret, NULL);
+                btrfs_handle_fs_error(root->fs_info, ret, NULL);
                 if (!list_empty(&reloc_roots))
                         free_reloc_roots(&reloc_roots);
 
@@ -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);