unregister_filesystem(&test_type);
 }
 
+struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info)
+{
+       struct btrfs_device *dev;
+
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev)
+               return ERR_PTR(-ENOMEM);
+
+       extent_io_tree_init(NULL, &dev->alloc_state, 0, NULL);
+       INIT_LIST_HEAD(&dev->dev_list);
+       list_add(&dev->dev_list, &fs_info->fs_devices->devices);
+
+       return dev;
+}
+
+static void btrfs_free_dummy_device(struct btrfs_device *dev)
+{
+       extent_io_tree_release(&dev->alloc_state);
+       kfree(dev);
+}
+
 struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize)
 {
        struct btrfs_fs_info *fs_info = kzalloc(sizeof(struct btrfs_fs_info),
        INIT_LIST_HEAD(&fs_info->dirty_qgroups);
        INIT_LIST_HEAD(&fs_info->dead_roots);
        INIT_LIST_HEAD(&fs_info->tree_mod_seq_list);
+       INIT_LIST_HEAD(&fs_info->fs_devices->devices);
        INIT_RADIX_TREE(&fs_info->buffer_radix, GFP_ATOMIC);
        INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_ATOMIC);
        extent_io_tree_init(fs_info, &fs_info->freed_extents[0],
                            IO_TREE_FS_INFO_FREED_EXTENTS0, NULL);
        extent_io_tree_init(fs_info, &fs_info->freed_extents[1],
                            IO_TREE_FS_INFO_FREED_EXTENTS1, NULL);
+       extent_map_tree_init(&fs_info->mapping_tree);
        fs_info->pinned_extents = &fs_info->freed_extents[0];
        set_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state);
 
 {
        struct radix_tree_iter iter;
        void **slot;
+       struct btrfs_device *dev, *tmp;
 
        if (!fs_info)
                return;
        }
        spin_unlock(&fs_info->buffer_lock);
 
+       btrfs_mapping_tree_free(&fs_info->mapping_tree);
+       list_for_each_entry_safe(dev, tmp, &fs_info->fs_devices->devices,
+                                dev_list) {
+               btrfs_free_dummy_device(dev);
+       }
        btrfs_free_qgroup_config(fs_info);
        btrfs_free_fs_roots(fs_info);
        cleanup_srcu_struct(&fs_info->subvol_srcu);