summaryrefslogtreecommitdiff
path: root/disk-io.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-10-15 16:25:04 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-10-15 16:25:04 -0400
commit08c66b7738e17ae2879d767a59ebec56c7a189b2 (patch)
treea9e2d24eac5cbeaf18f8ddfb4ab5ffb661068b0a /disk-io.c
parentf12d799856c27ba425db93e5829f6b858bc03561 (diff)
downloadbtrfs-progs-08c66b7738e17ae2879d767a59ebec56c7a189b2.tar.gz
Stop using radix trees to record pending allocations
Diffstat (limited to 'disk-io.c')
-rw-r--r--disk-io.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/disk-io.c b/disk-io.c
index ca5a136..4c467c5 100644
--- a/disk-io.c
+++ b/disk-io.c
@@ -343,10 +343,12 @@ struct btrfs_root *open_ctree_fd(int fp, struct btrfs_super_block *super)
int ret;
INIT_RADIX_TREE(&fs_info->cache_radix, GFP_KERNEL);
- INIT_RADIX_TREE(&fs_info->pinned_radix, GFP_KERNEL);
INIT_RADIX_TREE(&fs_info->block_group_radix, GFP_KERNEL);
INIT_LIST_HEAD(&fs_info->trans);
INIT_LIST_HEAD(&fs_info->cache);
+ pending_tree_init(&fs_info->pending_tree);
+ pending_tree_init(&fs_info->pinned_tree);
+ pending_tree_init(&fs_info->del_pending);
fs_info->cache_size = 0;
fs_info->fp = fp;
fs_info->running_transaction = NULL;
@@ -356,7 +358,6 @@ struct btrfs_root *open_ctree_fd(int fp, struct btrfs_super_block *super)
fs_info->last_inode_alloc = 0;
fs_info->last_inode_alloc_dirid = 0;
fs_info->disk_super = super;
- memset(&fs_info->current_insert, 0, sizeof(fs_info->current_insert));
memset(&fs_info->last_insert, 0, sizeof(fs_info->last_insert));
ret = pread(fp, super, sizeof(struct btrfs_super_block),