diff options
Diffstat (limited to 'disk-io.c')
-rw-r--r-- | disk-io.c | 30 |
1 files changed, 2 insertions, 28 deletions
@@ -35,8 +35,6 @@ #include "utils.h" #include "print-tree.h" -static int close_all_devices(struct btrfs_fs_info *fs_info); - static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf) { @@ -1028,7 +1026,7 @@ out_chunk: if (fs_info->chunk_root) free_extent_buffer(fs_info->chunk_root->node); out_devices: - close_all_devices(fs_info); + btrfs_close_devices(fs_info->fs_devices); out_cleanup: extent_io_tree_cleanup(&fs_info->extent_cache); extent_io_tree_cleanup(&fs_info->free_space_cache); @@ -1261,30 +1259,6 @@ int write_ctree_super(struct btrfs_trans_handle *trans, return ret; } -static int close_all_devices(struct btrfs_fs_info *fs_info) -{ - struct list_head *list; - struct btrfs_device *device; - - list = &fs_info->fs_devices->devices; - while (!list_empty(list)) { - device = list_entry(list->next, struct btrfs_device, dev_list); - list_del_init(&device->dev_list); - if (device->fd != -1) { - fsync(device->fd); - if (posix_fadvise(device->fd, 0, 0, POSIX_FADV_DONTNEED)) - fprintf(stderr, "Warning, could not drop caches\n"); - close(device->fd); - device->fd = -1; - } - kfree(device->name); - kfree(device->label); - kfree(device); - } - kfree(fs_info->fs_devices); - return 0; -} - static void free_mapping_cache(struct btrfs_fs_info *fs_info) { struct cache_tree *cache_tree = &fs_info->mapping_tree.cache_tree; @@ -1337,7 +1311,7 @@ int close_ctree(struct btrfs_root *root) free(fs_info->log_root_tree); } - close_all_devices(fs_info); + btrfs_close_devices(fs_info->fs_devices); free_mapping_cache(fs_info); extent_io_tree_cleanup(&fs_info->extent_cache); extent_io_tree_cleanup(&fs_info->free_space_cache); |