diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 78ad31a59e59..0143c922b1ef 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3334,25 +3334,12 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,

                cache = btrfs_lookup_block_group(fs_info, buf->start);

-               if (btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) {
-                       pin_down_extent(trans, cache, buf->start, buf->len, 1);
-                       btrfs_put_block_group(cache);
-                       goto out;
-               }
-
-               if (btrfs_is_zoned(fs_info)) {
+               if (!btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN) &&
+                   btrfs_is_zoned(fs_info))
                        btrfs_redirty_list_add(trans->transaction, buf);
-                       pin_down_extent(trans, cache, buf->start, buf->len, 1);
-                       btrfs_put_block_group(cache);
-                       goto out;
-               }
-
-               WARN_ON(test_bit(EXTENT_BUFFER_DIRTY, &buf->bflags));

-               btrfs_add_free_space(cache, buf->start, buf->len);
-               btrfs_free_reserved_bytes(cache, buf->len, 0);
+               pin_down_extent(trans, cache, buf->start, buf->len, 1);
                btrfs_put_block_group(cache);
-               trace_btrfs_reserved_extent_free(fs_info, buf->start, buf->len);
        }
 out:
        if (last_ref) {