}
static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
- struct btrfs_root *root,
+ u32 stripesize, struct btrfs_root *root,
struct btrfs_fs_info *fs_info,
u64 objectid)
{
root->sectorsize = sectorsize;
root->nodesize = nodesize;
root->leafsize = leafsize;
+ root->stripesize = stripesize;
root->ref_cows = 0;
root->fs_info = fs_info;
root->objectid = objectid;
u32 blocksize;
__setup_root(tree_root->nodesize, tree_root->leafsize,
- tree_root->sectorsize, root, fs_info, objectid);
+ tree_root->sectorsize, tree_root->stripesize,
+ root, fs_info, objectid);
ret = btrfs_find_last_root(tree_root, objectid,
&root->root_item, &root->root_key);
BUG_ON(ret);
}
__setup_root(tree_root->nodesize, tree_root->leafsize,
- tree_root->sectorsize, root, fs_info,
- location->objectid);
+ tree_root->sectorsize, tree_root->stripesize,
+ root, fs_info, location->objectid);
path = btrfs_alloc_path();
BUG_ON(!path);
u32 nodesize;
u32 leafsize;
u32 blocksize;
+ u32 stripesize;
struct btrfs_root *extent_root = kmalloc(sizeof(struct btrfs_root),
GFP_NOFS);
struct btrfs_root *tree_root = kmalloc(sizeof(struct btrfs_root),
fs_info->tree_root = tree_root;
fs_info->extent_root = extent_root;
fs_info->sb = sb;
+ fs_info->mount_opt = 0;
+ fs_info->max_extent = (u64)-1;
fs_info->btree_inode = new_inode(sb);
fs_info->btree_inode->i_ino = 1;
fs_info->btree_inode->i_nlink = 1;
fs_info->do_barriers = 1;
fs_info->closing = 0;
fs_info->total_pinned = 0;
-
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
+ INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info);
+#else
INIT_DELAYED_WORK(&fs_info->trans_work, btrfs_transaction_cleaner);
+#endif
BTRFS_I(fs_info->btree_inode)->root = tree_root;
memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
sizeof(struct btrfs_key));
goto fail_iput;
}
#endif
- __setup_root(512, 512, 512, tree_root,
+ __setup_root(512, 512, 512, 512, tree_root,
fs_info, BTRFS_ROOT_TREE_OBJECTID);
fs_info->sb_buffer = read_tree_block(tree_root,
nodesize = btrfs_super_nodesize(disk_super);
leafsize = btrfs_super_leafsize(disk_super);
sectorsize = btrfs_super_sectorsize(disk_super);
+ stripesize = btrfs_super_stripesize(disk_super);
tree_root->nodesize = nodesize;
tree_root->leafsize = leafsize;
tree_root->sectorsize = sectorsize;
+ tree_root->stripesize = stripesize;
sb_set_blocksize(sb, sectorsize);
i_size_write(fs_info->btree_inode,
btrfs_free_block_groups(root->fs_info);
del_fs_roots(fs_info);
+
+ filemap_write_and_wait(fs_info->btree_inode->i_mapping);
+
+ extent_map_tree_empty_lru(&fs_info->free_space_cache);
+ extent_map_tree_empty_lru(&fs_info->block_group_cache);
+ extent_map_tree_empty_lru(&fs_info->pinned_extents);
+ extent_map_tree_empty_lru(&fs_info->pending_del);
+ extent_map_tree_empty_lru(&fs_info->extent_ins);
extent_map_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->extent_tree);
+
truncate_inode_pages(fs_info->btree_inode->i_mapping, 0);
+
iput(fs_info->btree_inode);
#if 0
while(!list_empty(&fs_info->hashers)) {