1 files changed, 13 insertions, 11 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index c7adff343ba9..5faf057f6f37 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -10831,17 +10831,6 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
         remove_em = (atomic_read(&block_group->trimming) == 0);
         spin_unlock(&block_group->lock);
 
-        if (remove_em) {
-                struct extent_map_tree *em_tree;
-
-                em_tree = &fs_info->mapping_tree.map_tree;
-                write_lock(&em_tree->lock);
-                remove_extent_mapping(em_tree, em);
-                write_unlock(&em_tree->lock);
-                /* once for the tree */
-                free_extent_map(em);
-        }
-
         mutex_unlock(&fs_info->chunk_mutex);
 
         ret = remove_block_group_free_space(trans, block_group);
@@ -10858,6 +10847,19 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans,
                 goto out;
 
         ret = btrfs_del_item(trans, root, path);
+        if (ret)
+                goto out;
+
+        if (remove_em) {
+                struct extent_map_tree *em_tree;
+
+                em_tree = &fs_info->mapping_tree.map_tree;
+                write_lock(&em_tree->lock);
+                remove_extent_mapping(em_tree, em);
+                write_unlock(&em_tree->lock);
+                /* once for the tree */
+                free_extent_map(em);
+        }
 out:
         if (remove_rsv)
                 btrfs_delayed_refs_rsv_release(fs_info, 1);