Btrfs: Back port to 2.6.18-el kernels

[deliverable/linux.git] / fs / btrfs / disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 60a30da6af00e2dbf09408bdbddbe6b674f2da00..ebb2db624fddab4c1ffce160322b78e9e0a01c81 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -568,6 +568,8 @@ struct btrfs_root *open_ctree(struct super_block *sb)
        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;
@@ -591,8 +593,11 @@ struct btrfs_root *open_ctree(struct super_block *sb)
        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));
@@ -764,8 +769,18 @@ int close_ctree(struct btrfs_root *root)
 
        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)) {