diff options
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 25e4b8f1d0ef..3ce80f71e98a 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1080,7 +1080,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, | |||
1080 | root->log_transid = 0; | 1080 | root->log_transid = 0; |
1081 | root->last_log_commit = 0; | 1081 | root->last_log_commit = 0; |
1082 | extent_io_tree_init(&root->dirty_log_pages, | 1082 | extent_io_tree_init(&root->dirty_log_pages, |
1083 | fs_info->btree_inode->i_mapping, GFP_NOFS); | 1083 | fs_info->btree_inode->i_mapping); |
1084 | 1084 | ||
1085 | memset(&root->root_key, 0, sizeof(root->root_key)); | 1085 | memset(&root->root_key, 0, sizeof(root->root_key)); |
1086 | memset(&root->root_item, 0, sizeof(root->root_item)); | 1086 | memset(&root->root_item, 0, sizeof(root->root_item)); |
@@ -1712,8 +1712,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1712 | 1712 | ||
1713 | RB_CLEAR_NODE(&BTRFS_I(fs_info->btree_inode)->rb_node); | 1713 | RB_CLEAR_NODE(&BTRFS_I(fs_info->btree_inode)->rb_node); |
1714 | extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree, | 1714 | extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree, |
1715 | fs_info->btree_inode->i_mapping, | 1715 | fs_info->btree_inode->i_mapping); |
1716 | GFP_NOFS); | ||
1717 | extent_map_tree_init(&BTRFS_I(fs_info->btree_inode)->extent_tree, | 1716 | extent_map_tree_init(&BTRFS_I(fs_info->btree_inode)->extent_tree, |
1718 | GFP_NOFS); | 1717 | GFP_NOFS); |
1719 | 1718 | ||
@@ -1729,9 +1728,9 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1729 | fs_info->block_group_cache_tree = RB_ROOT; | 1728 | fs_info->block_group_cache_tree = RB_ROOT; |
1730 | 1729 | ||
1731 | extent_io_tree_init(&fs_info->freed_extents[0], | 1730 | extent_io_tree_init(&fs_info->freed_extents[0], |
1732 | fs_info->btree_inode->i_mapping, GFP_NOFS); | 1731 | fs_info->btree_inode->i_mapping); |
1733 | extent_io_tree_init(&fs_info->freed_extents[1], | 1732 | extent_io_tree_init(&fs_info->freed_extents[1], |
1734 | fs_info->btree_inode->i_mapping, GFP_NOFS); | 1733 | fs_info->btree_inode->i_mapping); |
1735 | fs_info->pinned_extents = &fs_info->freed_extents[0]; | 1734 | fs_info->pinned_extents = &fs_info->freed_extents[0]; |
1736 | fs_info->do_barriers = 1; | 1735 | fs_info->do_barriers = 1; |
1737 | 1736 | ||