]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - fs/btrfs/disk-io.c
Btrfs: Enable delalloc accounting
[linux-2.6-omap-h63xx.git] / fs / btrfs / disk-io.c
index 8a74f9027d6504459c827fec113fc51211df671c..ad72e2192015dd5003897f1c7a6bed706300f6d4 100644 (file)
@@ -43,14 +43,14 @@ static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
 }
 #endif
 
-static struct extent_map_ops btree_extent_map_ops;
+static struct extent_io_ops btree_extent_io_ops;
 
 struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,
                                            u64 bytenr, u32 blocksize)
 {
        struct inode *btree_inode = root->fs_info->btree_inode;
        struct extent_buffer *eb;
-       eb = find_extent_buffer(&BTRFS_I(btree_inode)->extent_tree,
+       eb = find_extent_buffer(&BTRFS_I(btree_inode)->io_tree,
                                bytenr, blocksize, GFP_NOFS);
        return eb;
 }
@@ -61,13 +61,13 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
        struct inode *btree_inode = root->fs_info->btree_inode;
        struct extent_buffer *eb;
 
-       eb = alloc_extent_buffer(&BTRFS_I(btree_inode)->extent_tree,
+       eb = alloc_extent_buffer(&BTRFS_I(btree_inode)->io_tree,
                                 bytenr, blocksize, NULL, GFP_NOFS);
        return eb;
 }
 
 struct extent_map *btree_get_extent(struct inode *inode, struct page *page,
-                                   size_t page_offset, u64 start, u64 end,
+                                   size_t page_offset, u64 start, u64 len,
                                    int create)
 {
        struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
@@ -75,7 +75,9 @@ struct extent_map *btree_get_extent(struct inode *inode, struct page *page,
        int ret;
 
 again:
-       em = lookup_extent_mapping(em_tree, start, end);
+       spin_lock(&em_tree->lock);
+       em = lookup_extent_mapping(em_tree, start, len);
+       spin_unlock(&em_tree->lock);
        if (em) {
                goto out;
        }
@@ -85,11 +87,14 @@ again:
                goto out;
        }
        em->start = 0;
-       em->end = (i_size_read(inode) & ~((u64)PAGE_CACHE_SIZE -1)) - 1;
+       em->len = i_size_read(inode);
        em->block_start = 0;
-       em->block_end = em->end;
        em->bdev = inode->i_sb->s_bdev;
+
+       spin_lock(&em_tree->lock);
        ret = add_extent_mapping(em_tree, em);
+       spin_unlock(&em_tree->lock);
+
        if (ret == -EEXIST) {
                free_extent_map(em);
                em = NULL;
@@ -145,10 +150,25 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
        btrfs_csum_final(crc, result);
 
        if (verify) {
-               if (memcmp_extent_buffer(buf, result, 0, BTRFS_CRC32_SIZE)) {
-                       printk("btrfs: %s checksum verify failed on %llu\n",
+               int from_this_trans = 0;
+
+               if (root->fs_info->running_transaction &&
+                   btrfs_header_generation(buf) ==
+                   root->fs_info->running_transaction->transid)
+                       from_this_trans = 1;
+
+               /* FIXME, this is not good */
+               if (from_this_trans == 0 &&
+                   memcmp_extent_buffer(buf, result, 0, BTRFS_CRC32_SIZE)) {
+                       u32 val;
+                       u32 found = 0;
+                       memcpy(&found, result, BTRFS_CRC32_SIZE);
+
+                       read_extent_buffer(buf, &val, 0, BTRFS_CRC32_SIZE);
+                       printk("btrfs: %s checksum verify failed on %llu "
+                              "wanted %X found %X from_this_trans %d\n",
                               root->fs_info->sb->s_id,
-                              buf->start);
+                              buf->start, val, found, from_this_trans);
                        return 1;
                }
        } else {
@@ -160,13 +180,13 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
 
 int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
 {
-       struct extent_map_tree *tree;
+       struct extent_io_tree *tree;
        u64 start = (u64)page->index << PAGE_CACHE_SHIFT;
        u64 found_start;
        int found_level;
        unsigned long len;
        struct extent_buffer *eb;
-       tree = &BTRFS_I(page->mapping->host)->extent_tree;
+       tree = &BTRFS_I(page->mapping->host)->io_tree;
 
        if (page->private == EXTENT_PAGE_PRIVATE)
                goto out;
@@ -178,13 +198,28 @@ int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
        }
        eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
        read_extent_buffer_pages(tree, eb, start + PAGE_CACHE_SIZE, 1);
+       btrfs_clear_buffer_defrag(eb);
        found_start = btrfs_header_bytenr(eb);
        if (found_start != start) {
                printk("warning: eb start incorrect %Lu buffer %Lu len %lu\n",
                       start, found_start, len);
+               WARN_ON(1);
+               goto err;
+       }
+       if (eb->first_page != page) {
+               printk("bad first page %lu %lu\n", eb->first_page->index,
+                      page->index);
+               WARN_ON(1);
+               goto err;
+       }
+       if (!PageUptodate(page)) {
+               printk("csum not up to date page %lu\n", page->index);
+               WARN_ON(1);
+               goto err;
        }
        found_level = btrfs_header_level(eb);
        csum_tree_block(root, eb, 0);
+err:
        free_extent_buffer(eb);
 out:
        return 0;
@@ -200,21 +235,31 @@ static int btree_writepage_io_hook(struct page *page, u64 start, u64 end)
 
 static int btree_writepage(struct page *page, struct writeback_control *wbc)
 {
-       struct extent_map_tree *tree;
-       tree = &BTRFS_I(page->mapping->host)->extent_tree;
+       struct extent_io_tree *tree;
+       tree = &BTRFS_I(page->mapping->host)->io_tree;
        return extent_write_full_page(tree, page, btree_get_extent, wbc);
 }
 
 static int btree_writepages(struct address_space *mapping,
                            struct writeback_control *wbc)
 {
-       struct extent_map_tree *tree;
-       tree = &BTRFS_I(mapping->host)->extent_tree;
-       if (wbc->sync_mode == WB_SYNC_NONE && current_is_pdflush()) {
+       struct extent_io_tree *tree;
+       tree = &BTRFS_I(mapping->host)->io_tree;
+       if (wbc->sync_mode == WB_SYNC_NONE) {
                u64 num_dirty;
                u64 start = 0;
                unsigned long thresh = 96 * 1024 * 1024;
-               num_dirty = count_range_bits(tree, &start, thresh, EXTENT_DIRTY);
+
+               if (wbc->for_kupdate)
+                       return 0;
+
+               if (current_is_pdflush()) {
+                       thresh = 96 * 1024 * 1024;
+               } else {
+                       thresh = 8 * 1024 * 1024;
+               }
+               num_dirty = count_range_bits(tree, &start, (u64)-1,
+                                            thresh, EXTENT_DIRTY);
                if (num_dirty < thresh) {
                        return 0;
                }
@@ -224,18 +269,20 @@ static int btree_writepages(struct address_space *mapping,
 
 int btree_readpage(struct file *file, struct page *page)
 {
-       struct extent_map_tree *tree;
-       tree = &BTRFS_I(page->mapping->host)->extent_tree;
+       struct extent_io_tree *tree;
+       tree = &BTRFS_I(page->mapping->host)->io_tree;
        return extent_read_full_page(tree, page, btree_get_extent);
 }
 
-static int btree_releasepage(struct page *page, gfp_t unused_gfp_flags)
+static int btree_releasepage(struct page *page, gfp_t gfp_flags)
 {
-       struct extent_map_tree *tree;
+       struct extent_io_tree *tree;
+       struct extent_map_tree *map;
        int ret;
 
-       tree = &BTRFS_I(page->mapping->host)->extent_tree;
-       ret = try_release_extent_mapping(tree, page);
+       tree = &BTRFS_I(page->mapping->host)->io_tree;
+       map = &BTRFS_I(page->mapping->host)->extent_tree;
+       ret = try_release_extent_mapping(map, tree, page, gfp_flags);
        if (ret == 1) {
                ClearPagePrivate(page);
                set_page_private(page, 0);
@@ -246,8 +293,8 @@ static int btree_releasepage(struct page *page, gfp_t unused_gfp_flags)
 
 static void btree_invalidatepage(struct page *page, unsigned long offset)
 {
-       struct extent_map_tree *tree;
-       tree = &BTRFS_I(page->mapping->host)->extent_tree;
+       struct extent_io_tree *tree;
+       tree = &BTRFS_I(page->mapping->host)->io_tree;
        extent_invalidatepage(tree, page, offset);
        btree_releasepage(page, GFP_NOFS);
 }
@@ -291,7 +338,7 @@ int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)
        buf = btrfs_find_create_tree_block(root, bytenr, blocksize);
        if (!buf)
                return 0;
-       read_extent_buffer_pages(&BTRFS_I(btree_inode)->extent_tree,
+       read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
                                 buf, 0, 0);
        free_extent_buffer(buf);
        return ret;
@@ -302,29 +349,39 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 {
        struct extent_buffer *buf = NULL;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       struct extent_map_tree *extent_tree;
+       struct extent_io_tree *io_tree;
+       u64 end;
        int ret;
 
-       extent_tree = &BTRFS_I(btree_inode)->extent_tree;
+       io_tree = &BTRFS_I(btree_inode)->io_tree;
 
        buf = btrfs_find_create_tree_block(root, bytenr, blocksize);
        if (!buf)
                return NULL;
-       read_extent_buffer_pages(&BTRFS_I(btree_inode)->extent_tree,
-                                buf, 0, 1);
-       if (buf->flags & EXTENT_CSUM) {
+       read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree, buf, 0, 1);
+
+       if (buf->flags & EXTENT_CSUM)
                return buf;
-       }
-       if (test_range_bit(extent_tree, buf->start, buf->start + buf->len - 1,
-                          EXTENT_CSUM, 1)) {
+
+       end = buf->start + PAGE_CACHE_SIZE - 1;
+       if (test_range_bit(io_tree, buf->start, end, EXTENT_CSUM, 1)) {
                buf->flags |= EXTENT_CSUM;
                return buf;
        }
+
+       lock_extent(io_tree, buf->start, end, GFP_NOFS);
+
+       if (test_range_bit(io_tree, buf->start, end, EXTENT_CSUM, 1)) {
+               buf->flags |= EXTENT_CSUM;
+               goto out_unlock;
+       }
+
        ret = csum_tree_block(root, buf, 1);
-       set_extent_bits(extent_tree, buf->start,
-                       buf->start + buf->len - 1,
-                       EXTENT_CSUM, GFP_NOFS);
+       set_extent_bits(io_tree, buf->start, end, EXTENT_CSUM, GFP_NOFS);
        buf->flags |= EXTENT_CSUM;
+
+out_unlock:
+       unlock_extent(io_tree, buf->start, end, GFP_NOFS);
        return buf;
 }
 
@@ -332,7 +389,10 @@ int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                     struct extent_buffer *buf)
 {
        struct inode *btree_inode = root->fs_info->btree_inode;
-       clear_extent_buffer_dirty(&BTRFS_I(btree_inode)->extent_tree, buf);
+       if (btrfs_header_generation(buf) ==
+           root->fs_info->running_transaction->transid)
+               clear_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree,
+                                         buf);
        return 0;
 }
 
@@ -340,13 +400,13 @@ int wait_on_tree_block_writeback(struct btrfs_root *root,
                                 struct extent_buffer *buf)
 {
        struct inode *btree_inode = root->fs_info->btree_inode;
-       wait_on_extent_buffer_writeback(&BTRFS_I(btree_inode)->extent_tree,
+       wait_on_extent_buffer_writeback(&BTRFS_I(btree_inode)->io_tree,
                                        buf);
        return 0;
 }
 
 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)
 {
@@ -356,6 +416,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        root->sectorsize = sectorsize;
        root->nodesize = nodesize;
        root->leafsize = leafsize;
+       root->stripesize = stripesize;
        root->ref_cows = 0;
        root->fs_info = fs_info;
        root->objectid = objectid;
@@ -363,12 +424,12 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        root->highest_inode = 0;
        root->last_inode_alloc = 0;
        root->name = NULL;
+       root->in_sysfs = 0;
        memset(&root->root_key, 0, sizeof(root->root_key));
        memset(&root->root_item, 0, sizeof(root->root_item));
        memset(&root->defrag_progress, 0, sizeof(root->defrag_progress));
        memset(&root->root_kobj, 0, sizeof(root->root_kobj));
        init_completion(&root->kobj_unregister);
-       init_rwsem(&root->snap_sem);
        root->defrag_running = 0;
        root->defrag_level = 0;
        root->root_key.objectid = objectid;
@@ -384,7 +445,8 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
        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);
@@ -421,8 +483,8 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_fs_info *fs_info,
        }
 
        __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);
@@ -459,13 +521,32 @@ insert:
        return root;
 }
 
-struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
-                                     struct btrfs_key *location,
-                                     const char *name, int namelen)
+struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info,
+                                       u64 root_objectid)
+{
+       struct btrfs_root *root;
+
+       if (root_objectid == BTRFS_ROOT_TREE_OBJECTID)
+               return fs_info->tree_root;
+       if (root_objectid == BTRFS_EXTENT_TREE_OBJECTID)
+               return fs_info->extent_root;
+
+       root = radix_tree_lookup(&fs_info->fs_roots_radix,
+                                (unsigned long)root_objectid);
+       return root;
+}
+
+struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
+                                             struct btrfs_key *location)
 {
        struct btrfs_root *root;
        int ret;
 
+       if (location->objectid == BTRFS_ROOT_TREE_OBJECTID)
+               return fs_info->tree_root;
+       if (location->objectid == BTRFS_EXTENT_TREE_OBJECTID)
+               return fs_info->extent_root;
+
        root = radix_tree_lookup(&fs_info->fs_roots_radix,
                                 (unsigned long)location->objectid);
        if (root)
@@ -482,6 +563,26 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
                kfree(root);
                return ERR_PTR(ret);
        }
+       ret = btrfs_find_dead_roots(fs_info->tree_root,
+                                   root->root_key.objectid, root);
+       BUG_ON(ret);
+
+       return root;
+}
+
+struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
+                                     struct btrfs_key *location,
+                                     const char *name, int namelen)
+{
+       struct btrfs_root *root;
+       int ret;
+
+       root = btrfs_read_fs_root_no_name(fs_info, location);
+       if (!root)
+               return NULL;
+
+       if (root->in_sysfs)
+               return root;
 
        ret = btrfs_set_root_name(root, name, namelen);
        if (ret) {
@@ -497,11 +598,7 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
                kfree(root);
                return ERR_PTR(ret);
        }
-
-       ret = btrfs_find_dead_roots(fs_info->tree_root,
-                                   root->root_key.objectid, root);
-       BUG_ON(ret);
-
+       root->in_sysfs = 1;
        return root;
 }
 #if 0
@@ -528,6 +625,7 @@ struct btrfs_root *open_ctree(struct super_block *sb)
        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),
@@ -547,6 +645,8 @@ struct btrfs_root *open_ctree(struct super_block *sb)
        INIT_LIST_HEAD(&fs_info->dead_roots);
        INIT_LIST_HEAD(&fs_info->hashers);
        spin_lock_init(&fs_info->hash_lock);
+       spin_lock_init(&fs_info->delalloc_lock);
+       spin_lock_init(&fs_info->new_trans_lock);
 
        memset(&fs_info->super_kobj, 0, sizeof(fs_info->super_kobj));
        init_completion(&fs_info->kobj_unregister);
@@ -556,31 +656,44 @@ 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->throttles = 0;
+       fs_info->mount_opt = 0;
+       fs_info->max_extent = (u64)-1;
+       fs_info->max_inline = 8192 * 1024;
+       fs_info->delalloc_bytes = 0;
        fs_info->btree_inode = new_inode(sb);
        fs_info->btree_inode->i_ino = 1;
        fs_info->btree_inode->i_nlink = 1;
        fs_info->btree_inode->i_size = sb->s_bdev->bd_inode->i_size;
        fs_info->btree_inode->i_mapping->a_ops = &btree_aops;
-       extent_map_tree_init(&BTRFS_I(fs_info->btree_inode)->extent_tree,
+       extent_io_tree_init(&BTRFS_I(fs_info->btree_inode)->io_tree,
                             fs_info->btree_inode->i_mapping,
                             GFP_NOFS);
-       BTRFS_I(fs_info->btree_inode)->extent_tree.ops = &btree_extent_map_ops;
+       extent_map_tree_init(&BTRFS_I(fs_info->btree_inode)->extent_tree,
+                            GFP_NOFS);
 
-       extent_map_tree_init(&fs_info->free_space_cache,
+       BTRFS_I(fs_info->btree_inode)->io_tree.ops = &btree_extent_io_ops;
+
+       extent_io_tree_init(&fs_info->free_space_cache,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
-       extent_map_tree_init(&fs_info->block_group_cache,
+       extent_io_tree_init(&fs_info->block_group_cache,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
-       extent_map_tree_init(&fs_info->pinned_extents,
+       extent_io_tree_init(&fs_info->pinned_extents,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
-       extent_map_tree_init(&fs_info->pending_del,
+       extent_io_tree_init(&fs_info->pending_del,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
-       extent_map_tree_init(&fs_info->extent_ins,
+       extent_io_tree_init(&fs_info->extent_ins,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
        fs_info->do_barriers = 1;
        fs_info->closing = 0;
        fs_info->total_pinned = 0;
+       fs_info->last_alloc = 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));
@@ -598,7 +711,7 @@ struct btrfs_root *open_ctree(struct super_block *sb)
                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,
@@ -621,9 +734,11 @@ struct btrfs_root *open_ctree(struct super_block *sb)
        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,
@@ -678,10 +793,15 @@ int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
        int ret;
        struct extent_buffer *super = root->fs_info->sb_buffer;
        struct inode *btree_inode = root->fs_info->btree_inode;
+       struct super_block *sb = root->fs_info->sb;
 
-       set_extent_buffer_dirty(&BTRFS_I(btree_inode)->extent_tree, super);
+       if (!btrfs_test_opt(root, NOBARRIER))
+               blkdev_issue_flush(sb->s_bdev, NULL);
+       set_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree, super);
        ret = sync_page_range_nolock(btree_inode, btree_inode->i_mapping,
                                     super->start, super->len);
+       if (!btrfs_test_opt(root, NOBARRIER))
+               blkdev_issue_flush(sb->s_bdev, NULL);
        return ret;
 }
 
@@ -689,7 +809,8 @@ int btrfs_free_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_root *root)
 {
        radix_tree_delete(&fs_info->fs_roots_radix,
                          (unsigned long)root->root_key.objectid);
-       btrfs_sysfs_del_root(root);
+       if (root->in_sysfs)
+               btrfs_sysfs_del_root(root);
        if (root->inode)
                iput(root->inode);
        if (root->node)
@@ -740,6 +861,10 @@ int close_ctree(struct btrfs_root *root)
        write_ctree_super(NULL, root);
        mutex_unlock(&fs_info->fs_mutex);
 
+       if (fs_info->delalloc_bytes) {
+               printk("btrfs: at unmount delalloc count %Lu\n",
+                      fs_info->delalloc_bytes);
+       }
        if (fs_info->extent_root->node)
                free_extent_buffer(fs_info->extent_root->node);
 
@@ -750,8 +875,18 @@ int close_ctree(struct btrfs_root *root)
 
        btrfs_free_block_groups(root->fs_info);
        del_fs_roots(fs_info);
-       extent_map_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->extent_tree);
+
+       filemap_write_and_wait(fs_info->btree_inode->i_mapping);
+
+       extent_io_tree_empty_lru(&fs_info->free_space_cache);
+       extent_io_tree_empty_lru(&fs_info->block_group_cache);
+       extent_io_tree_empty_lru(&fs_info->pinned_extents);
+       extent_io_tree_empty_lru(&fs_info->pending_del);
+       extent_io_tree_empty_lru(&fs_info->extent_ins);
+       extent_io_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->io_tree);
+
        truncate_inode_pages(fs_info->btree_inode->i_mapping, 0);
+
        iput(fs_info->btree_inode);
 #if 0
        while(!list_empty(&fs_info->hashers)) {
@@ -771,13 +906,13 @@ int close_ctree(struct btrfs_root *root)
 int btrfs_buffer_uptodate(struct extent_buffer *buf)
 {
        struct inode *btree_inode = buf->first_page->mapping->host;
-       return extent_buffer_uptodate(&BTRFS_I(btree_inode)->extent_tree, buf);
+       return extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree, buf);
 }
 
 int btrfs_set_buffer_uptodate(struct extent_buffer *buf)
 {
        struct inode *btree_inode = buf->first_page->mapping->host;
-       return set_extent_buffer_uptodate(&BTRFS_I(btree_inode)->extent_tree,
+       return set_extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree,
                                          buf);
 }
 
@@ -793,7 +928,21 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
                        transid, root->fs_info->generation);
                WARN_ON(1);
        }
-       set_extent_buffer_dirty(&BTRFS_I(btree_inode)->extent_tree, buf);
+       set_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree, buf);
+}
+
+void btrfs_throttle(struct btrfs_root *root)
+{
+       struct backing_dev_info *bdi;
+
+       bdi = root->fs_info->sb->s_bdev->bd_inode->i_mapping->backing_dev_info;
+       if (root->fs_info->throttles && bdi_write_congested(bdi)) {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
+               congestion_wait(WRITE, HZ/20);
+#else
+               blk_congestion_wait(WRITE, HZ/20);
+#endif
+       }
 }
 
 void btrfs_btree_balance_dirty(struct btrfs_root *root, unsigned long nr)
@@ -806,7 +955,7 @@ void btrfs_set_buffer_defrag(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       set_extent_bits(&BTRFS_I(btree_inode)->extent_tree, buf->start,
+       set_extent_bits(&BTRFS_I(btree_inode)->io_tree, buf->start,
                        buf->start + buf->len - 1, EXTENT_DEFRAG, GFP_NOFS);
 }
 
@@ -814,7 +963,7 @@ void btrfs_set_buffer_defrag_done(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       set_extent_bits(&BTRFS_I(btree_inode)->extent_tree, buf->start,
+       set_extent_bits(&BTRFS_I(btree_inode)->io_tree, buf->start,
                        buf->start + buf->len - 1, EXTENT_DEFRAG_DONE,
                        GFP_NOFS);
 }
@@ -823,7 +972,7 @@ int btrfs_buffer_defrag(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       return test_range_bit(&BTRFS_I(btree_inode)->extent_tree,
+       return test_range_bit(&BTRFS_I(btree_inode)->io_tree,
                     buf->start, buf->start + buf->len - 1, EXTENT_DEFRAG, 0);
 }
 
@@ -831,7 +980,7 @@ int btrfs_buffer_defrag_done(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       return test_range_bit(&BTRFS_I(btree_inode)->extent_tree,
+       return test_range_bit(&BTRFS_I(btree_inode)->io_tree,
                     buf->start, buf->start + buf->len - 1,
                     EXTENT_DEFRAG_DONE, 0);
 }
@@ -840,7 +989,7 @@ int btrfs_clear_buffer_defrag_done(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       return clear_extent_bits(&BTRFS_I(btree_inode)->extent_tree,
+       return clear_extent_bits(&BTRFS_I(btree_inode)->io_tree,
                     buf->start, buf->start + buf->len - 1,
                     EXTENT_DEFRAG_DONE, GFP_NOFS);
 }
@@ -849,7 +998,7 @@ int btrfs_clear_buffer_defrag(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       return clear_extent_bits(&BTRFS_I(btree_inode)->extent_tree,
+       return clear_extent_bits(&BTRFS_I(btree_inode)->io_tree,
                     buf->start, buf->start + buf->len - 1,
                     EXTENT_DEFRAG, GFP_NOFS);
 }
@@ -858,10 +1007,10 @@ int btrfs_read_buffer(struct extent_buffer *buf)
 {
        struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
        struct inode *btree_inode = root->fs_info->btree_inode;
-       return read_extent_buffer_pages(&BTRFS_I(btree_inode)->extent_tree,
+       return read_extent_buffer_pages(&BTRFS_I(btree_inode)->io_tree,
                                        buf, 0, 1);
 }
 
-static struct extent_map_ops btree_extent_map_ops = {
+static struct extent_io_ops btree_extent_io_ops = {
        .writepage_io_hook = btree_writepage_io_hook,
 };