Btrfs: Fix compile warnings on 32 bit machines
[linux-2.6-block.git] / fs / btrfs / disk-io.c
index 71838264ca6ba2d8d4385a840a2ddb320abe90ba..1bb54d69fbb24416f80a2fd17151274c64042577 100644 (file)
@@ -16,6 +16,7 @@
  * Boston, MA 021110-1307, USA.
  */
 
+#include <linux/version.h>
 #include <linux/fs.h>
 #include <linux/blkdev.h>
 #include <linux/scatterlist.h>
@@ -24,6 +25,8 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h> // for block_sync_page
 #include <linux/workqueue.h>
+#include <linux/kthread.h>
+# include <linux/freezer.h>
 #include "crc32c.h"
 #include "ctree.h"
 #include "disk-io.h"
 #include "btrfs_inode.h"
 #include "volumes.h"
 #include "print-tree.h"
+#include "async-thread.h"
+#include "locking.h"
+#include "ref-cache.h"
+#include "tree-log.h"
 
 #if 0
 static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
@@ -46,9 +53,13 @@ static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
 #endif
 
 static struct extent_io_ops btree_extent_io_ops;
-static struct workqueue_struct *end_io_workqueue;
-static struct workqueue_struct *async_submit_workqueue;
+static void end_workqueue_fn(struct btrfs_work *work);
 
+/*
+ * end_io_wq structs are used to do processing in task context when an IO is
+ * complete.  This is used during reads to verify checksums, and it is used
+ * by writes to insert metadata for new file extents after IO is complete.
+ */
 struct end_io_wq {
        struct bio *bio;
        bio_end_io_t *end_io;
@@ -57,17 +68,30 @@ struct end_io_wq {
        int error;
        int metadata;
        struct list_head list;
+       struct btrfs_work work;
 };
 
+/*
+ * async submit bios are used to offload expensive checksumming
+ * onto the worker threads.  They checksum file and metadata bios
+ * just before they are sent down the IO stack.
+ */
 struct async_submit_bio {
        struct inode *inode;
        struct bio *bio;
        struct list_head list;
-       extent_submit_bio_hook_t *submit_bio_hook;
+       extent_submit_bio_hook_t *submit_bio_start;
+       extent_submit_bio_hook_t *submit_bio_done;
        int rw;
        int mirror_num;
+       unsigned long bio_flags;
+       struct btrfs_work work;
 };
 
+/*
+ * extents on the btree inode are pretty simple, there's one extent
+ * that covers the entire device
+ */
 struct extent_map *btree_get_extent(struct inode *inode, struct page *page,
                                    size_t page_offset, u64 start, u64 len,
                                    int create)
@@ -78,9 +102,13 @@ struct extent_map *btree_get_extent(struct inode *inode, struct page *page,
 
        spin_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, start, len);
-       spin_unlock(&em_tree->lock);
-       if (em)
+       if (em) {
+               em->bdev =
+                       BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
+               spin_unlock(&em_tree->lock);
                goto out;
+       }
+       spin_unlock(&em_tree->lock);
 
        em = alloc_extent_map(GFP_NOFS);
        if (!em) {
@@ -89,8 +117,9 @@ struct extent_map *btree_get_extent(struct inode *inode, struct page *page,
        }
        em->start = 0;
        em->len = (u64)-1;
+       em->block_len = (u64)-1;
        em->block_start = 0;
-       em->bdev = inode->i_sb->s_bdev;
+       em->bdev = BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev;
 
        spin_lock(&em_tree->lock);
        ret = add_extent_mapping(em_tree, em);
@@ -139,6 +168,10 @@ void btrfs_csum_final(u32 crc, char *result)
        *(__le32 *)result = ~cpu_to_le32(crc);
 }
 
+/*
+ * compute the csum for a btree block, and either verify it or write it
+ * into the csum field of the block.
+ */
 static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
                           int verify)
 {
@@ -173,13 +206,6 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
        btrfs_csum_final(crc, result);
 
        if (verify) {
-               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 (memcmp_extent_buffer(buf, result, 0, BTRFS_CRC32_SIZE)) {
                        u32 val;
@@ -188,11 +214,9 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
 
                        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 "
-                              "level %d\n",
+                              "wanted %X found %X level %d\n",
                               root->fs_info->sb->s_id,
-                              buf->start, val, found, from_this_trans,
-                              btrfs_header_level(buf));
+                              buf->start, val, found, btrfs_header_level(buf));
                        return 1;
                }
        } else {
@@ -201,9 +225,45 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
        return 0;
 }
 
+/*
+ * we can't consider a given block up to date unless the transid of the
+ * block matches the transid in the parent node's pointer.  This is how we
+ * detect blocks that either didn't get written at all or got written
+ * in the wrong place.
+ */
+static int verify_parent_transid(struct extent_io_tree *io_tree,
+                                struct extent_buffer *eb, u64 parent_transid)
+{
+       int ret;
+
+       if (!parent_transid || btrfs_header_generation(eb) == parent_transid)
+               return 0;
+
+       lock_extent(io_tree, eb->start, eb->start + eb->len - 1, GFP_NOFS);
+       if (extent_buffer_uptodate(io_tree, eb) &&
+           btrfs_header_generation(eb) == parent_transid) {
+               ret = 0;
+               goto out;
+       }
+       printk("parent transid verify failed on %llu wanted %llu found %llu\n",
+              (unsigned long long)eb->start,
+              (unsigned long long)parent_transid,
+              (unsigned long long)btrfs_header_generation(eb));
+       ret = 1;
+       clear_extent_buffer_uptodate(io_tree, eb);
+out:
+       unlock_extent(io_tree, eb->start, eb->start + eb->len - 1,
+                     GFP_NOFS);
+       return ret;
+}
+
+/*
+ * helper to read a given tree block, doing retries as required when
+ * the checksums don't match and we have alternate mirrors to try.
+ */
 static int btree_read_extent_buffer_pages(struct btrfs_root *root,
                                          struct extent_buffer *eb,
-                                         u64 start)
+                                         u64 start, u64 parent_transid)
 {
        struct extent_io_tree *io_tree;
        int ret;
@@ -214,28 +274,26 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
        while (1) {
                ret = read_extent_buffer_pages(io_tree, eb, start, 1,
                                               btree_get_extent, mirror_num);
-               if (!ret) {
-                       if (mirror_num)
-printk("good read %Lu mirror %d total %d\n", eb->start, mirror_num, num_copies);
+               if (!ret &&
+                   !verify_parent_transid(io_tree, eb, parent_transid))
                        return ret;
-               }
+printk("read extent buffer pages failed with ret %d mirror no %d\n", ret, mirror_num);
                num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
                                              eb->start, eb->len);
-printk("failed to read %Lu mirror %d total %d\n", eb->start, mirror_num, num_copies);
-               if (num_copies == 1) {
-printk("reading %Lu failed only one copy\n", eb->start);
+               if (num_copies == 1)
                        return ret;
-               }
+
                mirror_num++;
-               if (mirror_num > num_copies) {
-printk("bailing at mirror %d of %d\n", mirror_num, num_copies);
+               if (mirror_num > num_copies)
                        return ret;
-               }
        }
-printk("read extent buffer page last\n");
        return -EIO;
 }
 
+/*
+ * checksum a dirty tree block before IO.  This has extra checks to make
+ * sure we only fill in the checksum field in the first page of a multi-page block
+ */
 int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
 {
        struct extent_io_tree *tree;
@@ -257,9 +315,9 @@ int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
                WARN_ON(1);
        }
        eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
-       ret = btree_read_extent_buffer_pages(root, eb, start + PAGE_CACHE_SIZE);
+       ret = btree_read_extent_buffer_pages(root, eb, start + PAGE_CACHE_SIZE,
+                                            btrfs_header_generation(eb));
        BUG_ON(ret);
-       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",
@@ -279,9 +337,7 @@ int csum_dirty_buffer(struct btrfs_root *root, struct page *page)
                goto err;
        }
        found_level = btrfs_header_level(eb);
-       spin_lock(&root->fs_info->hash_lock);
-       btrfs_set_header_flag(eb, BTRFS_HEADER_FLAG_WRITTEN);
-       spin_unlock(&root->fs_info->hash_lock);
+
        csum_tree_block(root, eb, 0);
 err:
        free_extent_buffer(eb);
@@ -289,14 +345,6 @@ out:
        return 0;
 }
 
-static int btree_writepage_io_hook(struct page *page, u64 start, u64 end)
-{
-       struct btrfs_root *root = BTRFS_I(page->mapping->host)->root;
-
-       csum_dirty_buffer(root, page);
-       return 0;
-}
-
 int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end,
                               struct extent_state *state)
 {
@@ -319,10 +367,11 @@ int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end,
        }
        eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
 
-       btrfs_clear_buffer_defrag(eb);
        found_start = btrfs_header_bytenr(eb);
        if (found_start != start) {
-printk("bad start on %Lu found %Lu\n", eb->start, found_start);
+               printk("bad tree block start %llu %llu\n",
+                      (unsigned long long)found_start,
+                      (unsigned long long)eb->start);
                ret = -EIO;
                goto err;
        }
@@ -333,6 +382,13 @@ printk("bad start on %Lu found %Lu\n", eb->start, found_start);
                ret = -EIO;
                goto err;
        }
+       if (memcmp_extent_buffer(eb, root->fs_info->fsid,
+                                (unsigned long)btrfs_header_fsid(eb),
+                                BTRFS_FSID_SIZE)) {
+               printk("bad fsid on block %Lu\n", eb->start);
+               ret = -EIO;
+               goto err;
+       }
        found_level = btrfs_header_level(eb);
 
        ret = csum_tree_block(root, eb, 1);
@@ -341,39 +397,26 @@ printk("bad start on %Lu found %Lu\n", eb->start, found_start);
 
        end = min_t(u64, eb->len, PAGE_CACHE_SIZE);
        end = eb->start + end - 1;
-       release_extent_buffer_tail_pages(eb);
 err:
        free_extent_buffer(eb);
 out:
        return ret;
 }
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,23)
 static void end_workqueue_bio(struct bio *bio, int err)
-#else
-static int end_workqueue_bio(struct bio *bio,
-                                  unsigned int bytes_done, int err)
-#endif
 {
        struct end_io_wq *end_io_wq = bio->bi_private;
        struct btrfs_fs_info *fs_info;
-       unsigned long flags;
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
-       if (bio->bi_size)
-               return 1;
-#endif
 
        fs_info = end_io_wq->info;
-       spin_lock_irqsave(&fs_info->end_io_work_lock, flags);
        end_io_wq->error = err;
-       list_add_tail(&end_io_wq->list, &fs_info->end_io_work_list);
-       spin_unlock_irqrestore(&fs_info->end_io_work_lock, flags);
-       queue_work(end_io_workqueue, &fs_info->end_io_work);
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
-       return 0;
-#endif
+       end_io_wq->work.func = end_workqueue_fn;
+       end_io_wq->work.flags = 0;
+       if (bio->bi_rw & (1 << BIO_RW))
+               btrfs_queue_worker(&fs_info->endio_write_workers,
+                                  &end_io_wq->work);
+       else
+               btrfs_queue_worker(&fs_info->endio_workers, &end_io_wq->work);
 }
 
 int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,
@@ -396,18 +439,69 @@ int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,
        return 0;
 }
 
+unsigned long btrfs_async_submit_limit(struct btrfs_fs_info *info)
+{
+       unsigned long limit = min_t(unsigned long,
+                                   info->workers.max_workers,
+                                   info->fs_devices->open_devices);
+       return 256 * limit;
+}
+
+int btrfs_congested_async(struct btrfs_fs_info *info, int iodone)
+{
+       return atomic_read(&info->nr_async_bios) >
+               btrfs_async_submit_limit(info);
+}
+
+static void run_one_async_start(struct btrfs_work *work)
+{
+       struct btrfs_fs_info *fs_info;
+       struct async_submit_bio *async;
+
+       async = container_of(work, struct  async_submit_bio, work);
+       fs_info = BTRFS_I(async->inode)->root->fs_info;
+       async->submit_bio_start(async->inode, async->rw, async->bio,
+                              async->mirror_num, async->bio_flags);
+}
+
+static void run_one_async_done(struct btrfs_work *work)
+{
+       struct btrfs_fs_info *fs_info;
+       struct async_submit_bio *async;
+       int limit;
+
+       async = container_of(work, struct  async_submit_bio, work);
+       fs_info = BTRFS_I(async->inode)->root->fs_info;
+
+       limit = btrfs_async_submit_limit(fs_info);
+       limit = limit * 2 / 3;
+
+       atomic_dec(&fs_info->nr_async_submits);
+
+       if (atomic_read(&fs_info->nr_async_submits) < limit &&
+           waitqueue_active(&fs_info->async_submit_wait))
+               wake_up(&fs_info->async_submit_wait);
+
+       async->submit_bio_done(async->inode, async->rw, async->bio,
+                              async->mirror_num, async->bio_flags);
+}
+
+static void run_one_async_free(struct btrfs_work *work)
+{
+       struct async_submit_bio *async;
+
+       async = container_of(work, struct  async_submit_bio, work);
+       kfree(async);
+}
+
 int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,
                        int rw, struct bio *bio, int mirror_num,
-                       extent_submit_bio_hook_t *submit_bio_hook)
+                       unsigned long bio_flags,
+                       extent_submit_bio_hook_t *submit_bio_start,
+                       extent_submit_bio_hook_t *submit_bio_done)
 {
        struct async_submit_bio *async;
-
-       /*
-        * inline writerback should stay inline, only hop to the async
-        * queue if we're pdflush
-        */
-       if (!current_is_pdflush())
-               return submit_bio_hook(inode, rw, bio, mirror_num);
+       int limit = btrfs_async_submit_limit(fs_info);
 
        async = kmalloc(sizeof(*async), GFP_NOFS);
        if (!async)
@@ -417,55 +511,118 @@ int btrfs_wq_submit_bio(struct btrfs_fs_info *fs_info, struct inode *inode,
        async->rw = rw;
        async->bio = bio;
        async->mirror_num = mirror_num;
-       async->submit_bio_hook = submit_bio_hook;
+       async->submit_bio_start = submit_bio_start;
+       async->submit_bio_done = submit_bio_done;
+
+       async->work.func = run_one_async_start;
+       async->work.ordered_func = run_one_async_done;
+       async->work.ordered_free = run_one_async_free;
+
+       async->work.flags = 0;
+       async->bio_flags = bio_flags;
+
+       while(atomic_read(&fs_info->async_submit_draining) &&
+             atomic_read(&fs_info->nr_async_submits)) {
+               wait_event(fs_info->async_submit_wait,
+                          (atomic_read(&fs_info->nr_async_submits) == 0));
+       }
+
+       atomic_inc(&fs_info->nr_async_submits);
+       btrfs_queue_worker(&fs_info->workers, &async->work);
+
+       if (atomic_read(&fs_info->nr_async_submits) > limit) {
+               wait_event_timeout(fs_info->async_submit_wait,
+                          (atomic_read(&fs_info->nr_async_submits) < limit),
+                          HZ/10);
 
-       spin_lock(&fs_info->async_submit_work_lock);
-       list_add_tail(&async->list, &fs_info->async_submit_work_list);
-       spin_unlock(&fs_info->async_submit_work_lock);
+               wait_event_timeout(fs_info->async_submit_wait,
+                          (atomic_read(&fs_info->nr_async_bios) < limit),
+                          HZ/10);
+       }
+
+       while(atomic_read(&fs_info->async_submit_draining) &&
+             atomic_read(&fs_info->nr_async_submits)) {
+               wait_event(fs_info->async_submit_wait,
+                          (atomic_read(&fs_info->nr_async_submits) == 0));
+       }
 
-       queue_work(async_submit_workqueue, &fs_info->async_submit_work);
        return 0;
 }
 
-static int __btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
-                                int mirror_num)
+static int btree_csum_one_bio(struct bio *bio)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       u64 offset;
-       int ret;
-
-       offset = bio->bi_sector << 9;
+       struct bio_vec *bvec = bio->bi_io_vec;
+       int bio_index = 0;
+       struct btrfs_root *root;
 
-       if (rw & (1 << BIO_RW)) {
-               return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, mirror_num);
+       WARN_ON(bio->bi_vcnt <= 0);
+       while(bio_index < bio->bi_vcnt) {
+               root = BTRFS_I(bvec->bv_page->mapping->host)->root;
+               csum_dirty_buffer(root, bvec->bv_page);
+               bio_index++;
+               bvec++;
        }
+       return 0;
+}
 
-       ret = btrfs_bio_wq_end_io(root->fs_info, bio, 1);
-       BUG_ON(ret);
+static int __btree_submit_bio_start(struct inode *inode, int rw,
+                                   struct bio *bio, int mirror_num,
+                                   unsigned long bio_flags)
+{
+       /*
+        * when we're called for a write, we're already in the async
+        * submission context.  Just jump into btrfs_map_bio
+        */
+       btree_csum_one_bio(bio);
+       return 0;
+}
 
-       if (offset == BTRFS_SUPER_INFO_OFFSET) {
-               bio->bi_bdev = root->fs_info->fs_devices->latest_bdev;
-               submit_bio(rw, bio);
-               return 0;
-       }
-       return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, mirror_num);
+static int __btree_submit_bio_done(struct inode *inode, int rw, struct bio *bio,
+                                int mirror_num, unsigned long bio_flags)
+{
+       /*
+        * when we're called for a write, we're already in the async
+        * submission context.  Just jump into btrfs_map_bio
+        */
+       return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio, mirror_num, 1);
 }
 
 static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
-                                int mirror_num)
+                                int mirror_num, unsigned long bio_flags)
 {
+       /*
+        * kthread helpers are used to submit writes so that checksumming
+        * can happen in parallel across all CPUs
+        */
        if (!(rw & (1 << BIO_RW))) {
-               return __btree_submit_bio_hook(inode, rw, bio, mirror_num);
+               int ret;
+               /*
+                * called for a read, do the setup so that checksum validation
+                * can happen in the async kernel threads
+                */
+               ret = btrfs_bio_wq_end_io(BTRFS_I(inode)->root->fs_info,
+                                         bio, 1);
+               BUG_ON(ret);
+
+               return btrfs_map_bio(BTRFS_I(inode)->root, rw, bio,
+                                    mirror_num, 1);
        }
        return btrfs_wq_submit_bio(BTRFS_I(inode)->root->fs_info,
-                                  inode, rw, bio, mirror_num,
-                                  __btree_submit_bio_hook);
+                                  inode, rw, bio, mirror_num, 0,
+                                  __btree_submit_bio_start,
+                                  __btree_submit_bio_done);
 }
 
 static int btree_writepage(struct page *page, struct writeback_control *wbc)
 {
        struct extent_io_tree *tree;
        tree = &BTRFS_I(page->mapping->host)->io_tree;
+
+       if (current->flags & PF_MEMALLOC) {
+               redirty_page_for_writepage(wbc, page);
+               unlock_page(page);
+               return 0;
+       }
        return extent_write_full_page(tree, page, btree_get_extent, wbc);
 }
 
@@ -477,16 +634,11 @@ static int btree_writepages(struct address_space *mapping,
        if (wbc->sync_mode == WB_SYNC_NONE) {
                u64 num_dirty;
                u64 start = 0;
-               unsigned long thresh = 96 * 1024 * 1024;
+               unsigned long thresh = 32 * 1024 * 1024;
 
                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) {
@@ -509,21 +661,24 @@ static int btree_releasepage(struct page *page, gfp_t gfp_flags)
        struct extent_map_tree *map;
        int ret;
 
-       if (page_count(page) > 3) {
-               /* once for page->private, once for the caller, once
-                * once for the page cache
-                */
-               return 0;
-       }
+       if (PageWriteback(page) || PageDirty(page))
+           return 0;
+
        tree = &BTRFS_I(page->mapping->host)->io_tree;
        map = &BTRFS_I(page->mapping->host)->extent_tree;
+
        ret = try_release_extent_state(map, tree, page, gfp_flags);
+       if (!ret) {
+               return 0;
+       }
+
+       ret = try_release_extent_buffer(tree, page);
        if (ret == 1) {
-               invalidate_extent_lru(tree, page_offset(page), PAGE_CACHE_SIZE);
                ClearPagePrivate(page);
                set_page_private(page, 0);
                page_cache_release(page);
        }
+
        return ret;
 }
 
@@ -534,7 +689,8 @@ static void btree_invalidatepage(struct page *page, unsigned long offset)
        extent_invalidatepage(tree, page, offset);
        btree_releasepage(page, GFP_NOFS);
        if (PagePrivate(page)) {
-               invalidate_extent_lru(tree, page_offset(page), PAGE_CACHE_SIZE);
+               printk("warning page private not zero on page %Lu\n",
+                      page_offset(page));
                ClearPagePrivate(page);
                set_page_private(page, 0);
                page_cache_release(page);
@@ -571,7 +727,8 @@ static struct address_space_operations btree_aops = {
        .sync_page      = block_sync_page,
 };
 
-int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)
+int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
+                        u64 parent_transid)
 {
        struct extent_buffer *buf = NULL;
        struct inode *btree_inode = root->fs_info->btree_inode;
@@ -586,28 +743,6 @@ int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize)
        return ret;
 }
 
-static int close_all_devices(struct btrfs_fs_info *fs_info)
-{
-       struct list_head *list;
-       struct list_head *next;
-       struct btrfs_device *device;
-
-       list = &fs_info->fs_devices->devices;
-       list_for_each(next, list) {
-               device = list_entry(next, struct btrfs_device, dev_list);
-               if (device->bdev && device->bdev != fs_info->sb->s_bdev)
-                       close_bdev_excl(device->bdev);
-               device->bdev = NULL;
-       }
-       return 0;
-}
-
-int btrfs_verify_block_csum(struct btrfs_root *root,
-                           struct extent_buffer *buf)
-{
-       return btrfs_buffer_uptodate(buf);
-}
-
 struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root,
                                            u64 bytenr, u32 blocksize)
 {
@@ -630,8 +765,20 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
 }
 
 
+int btrfs_write_tree_block(struct extent_buffer *buf)
+{
+       return btrfs_fdatawrite_range(buf->first_page->mapping, buf->start,
+                                     buf->start + buf->len - 1, WB_SYNC_ALL);
+}
+
+int btrfs_wait_tree_block_writeback(struct extent_buffer *buf)
+{
+       return btrfs_wait_on_page_writeback_range(buf->first_page->mapping,
+                                 buf->start, buf->start + buf->len -1);
+}
+
 struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
-                                     u32 blocksize)
+                                     u32 blocksize, u64 parent_transid)
 {
        struct extent_buffer *buf = NULL;
        struct inode *btree_inode = root->fs_info->btree_inode;
@@ -644,10 +791,12 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
        if (!buf)
                return NULL;
 
-       ret = btree_read_extent_buffer_pages(root, buf, 0);
+       ret = btree_read_extent_buffer_pages(root, buf, 0, parent_transid);
 
        if (ret == 0) {
                buf->flags |= EXTENT_UPTODATE;
+       } else {
+               WARN_ON(1);
        }
        return buf;
 
@@ -658,18 +807,11 @@ int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 {
        struct inode *btree_inode = root->fs_info->btree_inode;
        if (btrfs_header_generation(buf) ==
-           root->fs_info->running_transaction->transid)
+           root->fs_info->running_transaction->transid) {
+               WARN_ON(!btrfs_tree_locked(buf));
                clear_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree,
                                          buf);
-       return 0;
-}
-
-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)->io_tree,
-                                       buf);
+       }
        return 0;
 }
 
@@ -681,6 +823,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        root->node = NULL;
        root->inode = NULL;
        root->commit_root = NULL;
+       root->ref_tree = NULL;
        root->sectorsize = sectorsize;
        root->nodesize = nodesize;
        root->leafsize = leafsize;
@@ -697,10 +840,23 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,
        root->in_sysfs = 0;
 
        INIT_LIST_HEAD(&root->dirty_list);
+       INIT_LIST_HEAD(&root->orphan_list);
+       INIT_LIST_HEAD(&root->dead_list);
+       spin_lock_init(&root->node_lock);
+       spin_lock_init(&root->list_lock);
+       mutex_init(&root->objectid_mutex);
+       mutex_init(&root->log_mutex);
+       extent_io_tree_init(&root->dirty_log_pages,
+                            fs_info->btree_inode->i_mapping, GFP_NOFS);
+
+       btrfs_leaf_ref_tree_init(&root->ref_tree_struct);
+       root->ref_tree = &root->ref_tree_struct;
+
        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));
+       root->defrag_trans_start = fs_info->generation;
        init_completion(&root->kobj_unregister);
        root->defrag_running = 0;
        root->defrag_level = 0;
@@ -715,6 +871,7 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
 {
        int ret;
        u32 blocksize;
+       u64 generation;
 
        __setup_root(tree_root->nodesize, tree_root->leafsize,
                     tree_root->sectorsize, tree_root->stripesize,
@@ -723,21 +880,97 @@ static int find_and_setup_root(struct btrfs_root *tree_root,
                                   &root->root_item, &root->root_key);
        BUG_ON(ret);
 
+       generation = btrfs_root_generation(&root->root_item);
        blocksize = btrfs_level_size(root, btrfs_root_level(&root->root_item));
        root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),
-                                    blocksize);
+                                    blocksize, generation);
        BUG_ON(!root->node);
        return 0;
 }
 
-struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_fs_info *fs_info,
-                                              struct btrfs_key *location)
+int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,
+                            struct btrfs_fs_info *fs_info)
+{
+       struct extent_buffer *eb;
+       struct btrfs_root *log_root_tree = fs_info->log_root_tree;
+       u64 start = 0;
+       u64 end = 0;
+       int ret;
+
+       if (!log_root_tree)
+               return 0;
+
+       while(1) {
+               ret = find_first_extent_bit(&log_root_tree->dirty_log_pages,
+                                   0, &start, &end, EXTENT_DIRTY);
+               if (ret)
+                       break;
+
+               clear_extent_dirty(&log_root_tree->dirty_log_pages,
+                                  start, end, GFP_NOFS);
+       }
+       eb = fs_info->log_root_tree->node;
+
+       WARN_ON(btrfs_header_level(eb) != 0);
+       WARN_ON(btrfs_header_nritems(eb) != 0);
+
+       ret = btrfs_free_reserved_extent(fs_info->tree_root,
+                               eb->start, eb->len);
+       BUG_ON(ret);
+
+       free_extent_buffer(eb);
+       kfree(fs_info->log_root_tree);
+       fs_info->log_root_tree = NULL;
+       return 0;
+}
+
+int btrfs_init_log_root_tree(struct btrfs_trans_handle *trans,
+                            struct btrfs_fs_info *fs_info)
 {
        struct btrfs_root *root;
        struct btrfs_root *tree_root = fs_info->tree_root;
+
+       root = kzalloc(sizeof(*root), GFP_NOFS);
+       if (!root)
+               return -ENOMEM;
+
+       __setup_root(tree_root->nodesize, tree_root->leafsize,
+                    tree_root->sectorsize, tree_root->stripesize,
+                    root, fs_info, BTRFS_TREE_LOG_OBJECTID);
+
+       root->root_key.objectid = BTRFS_TREE_LOG_OBJECTID;
+       root->root_key.type = BTRFS_ROOT_ITEM_KEY;
+       root->root_key.offset = BTRFS_TREE_LOG_OBJECTID;
+       root->ref_cows = 0;
+
+       root->node = btrfs_alloc_free_block(trans, root, root->leafsize,
+                                           0, BTRFS_TREE_LOG_OBJECTID,
+                                           trans->transid, 0, 0, 0);
+
+       btrfs_set_header_nritems(root->node, 0);
+       btrfs_set_header_level(root->node, 0);
+       btrfs_set_header_bytenr(root->node, root->node->start);
+       btrfs_set_header_generation(root->node, trans->transid);
+       btrfs_set_header_owner(root->node, BTRFS_TREE_LOG_OBJECTID);
+
+       write_extent_buffer(root->node, root->fs_info->fsid,
+                           (unsigned long)btrfs_header_fsid(root->node),
+                           BTRFS_FSID_SIZE);
+       btrfs_mark_buffer_dirty(root->node);
+       btrfs_tree_unlock(root->node);
+       fs_info->log_root_tree = root;
+       return 0;
+}
+
+struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root,
+                                              struct btrfs_key *location)
+{
+       struct btrfs_root *root;
+       struct btrfs_fs_info *fs_info = tree_root->fs_info;
        struct btrfs_path *path;
        struct extent_buffer *l;
        u64 highest_inode;
+       u64 generation;
        u32 blocksize;
        int ret = 0;
 
@@ -779,16 +1012,19 @@ out:
                kfree(root);
                return ERR_PTR(ret);
        }
+       generation = btrfs_root_generation(&root->root_item);
        blocksize = btrfs_level_size(root, btrfs_root_level(&root->root_item));
        root->node = read_tree_block(root, btrfs_root_bytenr(&root->root_item),
-                                    blocksize);
+                                    blocksize, generation);
        BUG_ON(!root->node);
 insert:
-       root->ref_cows = 1;
-       ret = btrfs_find_highest_inode(root, &highest_inode);
-       if (ret == 0) {
-               root->highest_inode = highest_inode;
-               root->last_inode_alloc = highest_inode;
+       if (location->objectid != BTRFS_TREE_LOG_OBJECTID) {
+               root->ref_cows = 1;
+               ret = btrfs_find_highest_inode(root, &highest_inode);
+               if (ret == 0) {
+                       root->highest_inode = highest_inode;
+                       root->last_inode_alloc = highest_inode;
+               }
        }
        return root;
 }
@@ -818,13 +1054,17 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,
                return fs_info->tree_root;
        if (location->objectid == BTRFS_EXTENT_TREE_OBJECTID)
                return fs_info->extent_root;
+       if (location->objectid == BTRFS_CHUNK_TREE_OBJECTID)
+               return fs_info->chunk_root;
+       if (location->objectid == BTRFS_DEV_TREE_OBJECTID)
+               return fs_info->dev_root;
 
        root = radix_tree_lookup(&fs_info->fs_roots_radix,
                                 (unsigned long)location->objectid);
        if (root)
                return root;
 
-       root = btrfs_read_fs_root_no_radix(fs_info, location);
+       root = btrfs_read_fs_root_no_radix(fs_info->tree_root, location);
        if (IS_ERR(root))
                return root;
        ret = radix_tree_insert(&fs_info->fs_roots_radix,
@@ -900,8 +1140,14 @@ static int btrfs_congested_fn(void *congested_data, int bdi_bits)
        struct btrfs_device *device;
        struct backing_dev_info *bdi;
 
+       if ((bdi_bits & (1 << BDI_write_congested)) &&
+           btrfs_congested_async(info, 0))
+               return 1;
+
        list_for_each(cur, &info->fs_devices->devices) {
                device = list_entry(cur, struct btrfs_device, dev_list);
+               if (!device->bdev)
+                       continue;
                bdi = blk_get_backing_dev_info(device->bdev);
                if (bdi && bdi_congested(bdi, bdi_bits)) {
                        ret = 1;
@@ -955,15 +1201,32 @@ void btrfs_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
                return;
 
        inode = mapping->host;
+
+       /*
+        * don't do the expensive searching for a small number of
+        * devices
+        */
+       if (BTRFS_I(inode)->root->fs_info->fs_devices->open_devices <= 2) {
+               __unplug_io_fn(bdi, page);
+               return;
+       }
+
        offset = page_offset(page);
 
        em_tree = &BTRFS_I(inode)->extent_tree;
        spin_lock(&em_tree->lock);
        em = lookup_extent_mapping(em_tree, offset, PAGE_CACHE_SIZE);
        spin_unlock(&em_tree->lock);
-       if (!em)
+       if (!em) {
+               __unplug_io_fn(bdi, page);
                return;
+       }
 
+       if (em->block_start >= EXTENT_MAP_LAST_BYTE) {
+               free_extent_map(em);
+               __unplug_io_fn(bdi, page);
+               return;
+       }
        offset = offset - em->start;
        btrfs_unplug_page(&BTRFS_I(inode)->root->fs_info->mapping_tree,
                          em->block_start + offset, page);
@@ -972,9 +1235,7 @@ void btrfs_unplug_io_fn(struct backing_dev_info *bdi, struct page *page)
 
 static int setup_bdi(struct btrfs_fs_info *info, struct backing_dev_info *bdi)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
        bdi_init(bdi);
-#endif
        bdi->ra_pages   = default_backing_dev_info.ra_pages;
        bdi->state              = 0;
        bdi->capabilities       = default_backing_dev_info.capabilities;
@@ -1024,140 +1285,166 @@ static int bio_ready_for_csum(struct bio *bio)
        return ret;
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-static void btrfs_end_io_csum(void *p)
-#else
-static void btrfs_end_io_csum(struct work_struct *work)
-#endif
+/*
+ * called by the kthread helper functions to finally call the bio end_io
+ * functions.  This is where read checksum verification actually happens
+ */
+static void end_workqueue_fn(struct btrfs_work *work)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-       struct btrfs_fs_info *fs_info = p;
-#else
-       struct btrfs_fs_info *fs_info = container_of(work,
-                                                    struct btrfs_fs_info,
-                                                    end_io_work);
-#endif
-       unsigned long flags;
-       struct end_io_wq *end_io_wq;
        struct bio *bio;
-       struct list_head *next;
+       struct end_io_wq *end_io_wq;
+       struct btrfs_fs_info *fs_info;
        int error;
-       int was_empty;
 
-       while(1) {
-               spin_lock_irqsave(&fs_info->end_io_work_lock, flags);
-               if (list_empty(&fs_info->end_io_work_list)) {
-                       spin_unlock_irqrestore(&fs_info->end_io_work_lock,
-                                              flags);
-                       return;
-               }
-               next = fs_info->end_io_work_list.next;
-               list_del(next);
-               spin_unlock_irqrestore(&fs_info->end_io_work_lock, flags);
-
-               end_io_wq = list_entry(next, struct end_io_wq, list);
-
-               bio = end_io_wq->bio;
-               if (end_io_wq->metadata && !bio_ready_for_csum(bio)) {
-                       spin_lock_irqsave(&fs_info->end_io_work_lock, flags);
-                       was_empty = list_empty(&fs_info->end_io_work_list);
-                       list_add_tail(&end_io_wq->list,
-                                     &fs_info->end_io_work_list);
-                       spin_unlock_irqrestore(&fs_info->end_io_work_lock,
-                                              flags);
-                       if (was_empty)
-                               return;
-                       continue;
-               }
-               error = end_io_wq->error;
-               bio->bi_private = end_io_wq->private;
-               bio->bi_end_io = end_io_wq->end_io;
-               kfree(end_io_wq);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
-               bio_endio(bio, bio->bi_size, error);
-#else
-               bio_endio(bio, error);
-#endif
+       end_io_wq = container_of(work, struct end_io_wq, work);
+       bio = end_io_wq->bio;
+       fs_info = end_io_wq->info;
+
+       /* metadata bios are special because the whole tree block must
+        * be checksummed at once.  This makes sure the entire block is in
+        * ram and up to date before trying to verify things.  For
+        * blocksize <= pagesize, it is basically a noop
+        */
+       if (end_io_wq->metadata && !bio_ready_for_csum(bio)) {
+               btrfs_queue_worker(&fs_info->endio_workers,
+                                  &end_io_wq->work);
+               return;
        }
+       error = end_io_wq->error;
+       bio->bi_private = end_io_wq->private;
+       bio->bi_end_io = end_io_wq->end_io;
+       kfree(end_io_wq);
+       bio_endio(bio, error);
 }
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-static void btrfs_async_submit_work(void *p)
-#else
-static void btrfs_async_submit_work(struct work_struct *work)
-#endif
+static int cleaner_kthread(void *arg)
 {
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-       struct btrfs_fs_info *fs_info = p;
-#else
-       struct btrfs_fs_info *fs_info = container_of(work,
-                                                    struct btrfs_fs_info,
-                                                    async_submit_work);
-#endif
-       struct async_submit_bio *async;
-       struct list_head *next;
+       struct btrfs_root *root = arg;
 
-       while(1) {
-               spin_lock(&fs_info->async_submit_work_lock);
-               if (list_empty(&fs_info->async_submit_work_list)) {
-                       spin_unlock(&fs_info->async_submit_work_lock);
-                       return;
+       do {
+               smp_mb();
+               if (root->fs_info->closing)
+                       break;
+
+               vfs_check_frozen(root->fs_info->sb, SB_FREEZE_WRITE);
+               mutex_lock(&root->fs_info->cleaner_mutex);
+               btrfs_clean_old_snapshots(root);
+               mutex_unlock(&root->fs_info->cleaner_mutex);
+
+               if (freezing(current)) {
+                       refrigerator();
+               } else {
+                       smp_mb();
+                       if (root->fs_info->closing)
+                               break;
+                       set_current_state(TASK_INTERRUPTIBLE);
+                       schedule();
+                       __set_current_state(TASK_RUNNING);
                }
-               next = fs_info->async_submit_work_list.next;
-               list_del(next);
-               spin_unlock(&fs_info->async_submit_work_lock);
+       } while (!kthread_should_stop());
+       return 0;
+}
 
-               async = list_entry(next, struct async_submit_bio, list);
-               async->submit_bio_hook(async->inode, async->rw, async->bio,
-                                      async->mirror_num);
-               kfree(async);
-       }
+static int transaction_kthread(void *arg)
+{
+       struct btrfs_root *root = arg;
+       struct btrfs_trans_handle *trans;
+       struct btrfs_transaction *cur;
+       unsigned long now;
+       unsigned long delay;
+       int ret;
+
+       do {
+               smp_mb();
+               if (root->fs_info->closing)
+                       break;
+
+               delay = HZ * 30;
+               vfs_check_frozen(root->fs_info->sb, SB_FREEZE_WRITE);
+               mutex_lock(&root->fs_info->transaction_kthread_mutex);
+
+               if (root->fs_info->total_ref_cache_size > 20 * 1024 * 1024) {
+                       printk("btrfs: total reference cache size %Lu\n",
+                               root->fs_info->total_ref_cache_size);
+               }
+
+               mutex_lock(&root->fs_info->trans_mutex);
+               cur = root->fs_info->running_transaction;
+               if (!cur) {
+                       mutex_unlock(&root->fs_info->trans_mutex);
+                       goto sleep;
+               }
+
+               now = get_seconds();
+               if (now < cur->start_time || now - cur->start_time < 30) {
+                       mutex_unlock(&root->fs_info->trans_mutex);
+                       delay = HZ * 5;
+                       goto sleep;
+               }
+               mutex_unlock(&root->fs_info->trans_mutex);
+               trans = btrfs_start_transaction(root, 1);
+               ret = btrfs_commit_transaction(trans, root);
+sleep:
+               wake_up_process(root->fs_info->cleaner_kthread);
+               mutex_unlock(&root->fs_info->transaction_kthread_mutex);
+
+               if (freezing(current)) {
+                       refrigerator();
+               } else {
+                       if (root->fs_info->closing)
+                               break;
+                       set_current_state(TASK_INTERRUPTIBLE);
+                       schedule_timeout(delay);
+                       __set_current_state(TASK_RUNNING);
+               }
+       } while (!kthread_should_stop());
+       return 0;
 }
 
 struct btrfs_root *open_ctree(struct super_block *sb,
-                             struct btrfs_fs_devices *fs_devices)
+                             struct btrfs_fs_devices *fs_devices,
+                             char *options)
 {
        u32 sectorsize;
        u32 nodesize;
        u32 leafsize;
        u32 blocksize;
        u32 stripesize;
-       struct btrfs_root *extent_root = kmalloc(sizeof(struct btrfs_root),
+       u64 generation;
+       struct buffer_head *bh;
+       struct btrfs_root *extent_root = kzalloc(sizeof(struct btrfs_root),
                                                 GFP_NOFS);
-       struct btrfs_root *tree_root = kmalloc(sizeof(struct btrfs_root),
+       struct btrfs_root *tree_root = kzalloc(sizeof(struct btrfs_root),
                                               GFP_NOFS);
        struct btrfs_fs_info *fs_info = kzalloc(sizeof(*fs_info),
                                                GFP_NOFS);
-       struct btrfs_root *chunk_root = kmalloc(sizeof(struct btrfs_root),
+       struct btrfs_root *chunk_root = kzalloc(sizeof(struct btrfs_root),
                                                GFP_NOFS);
-       struct btrfs_root *dev_root = kmalloc(sizeof(struct btrfs_root),
+       struct btrfs_root *dev_root = kzalloc(sizeof(struct btrfs_root),
                                              GFP_NOFS);
+       struct btrfs_root *log_tree_root;
+
        int ret;
        int err = -EINVAL;
+
        struct btrfs_super_block *disk_super;
 
-       if (!extent_root || !tree_root || !fs_info) {
+       if (!extent_root || !tree_root || !fs_info ||
+           !chunk_root || !dev_root) {
                err = -ENOMEM;
                goto fail;
        }
-       end_io_workqueue = create_workqueue("btrfs-end-io");
-       BUG_ON(!end_io_workqueue);
-       async_submit_workqueue = create_workqueue("btrfs-async-submit");
-
        INIT_RADIX_TREE(&fs_info->fs_roots_radix, GFP_NOFS);
        INIT_LIST_HEAD(&fs_info->trans_list);
        INIT_LIST_HEAD(&fs_info->dead_roots);
        INIT_LIST_HEAD(&fs_info->hashers);
-       INIT_LIST_HEAD(&fs_info->end_io_work_list);
-       INIT_LIST_HEAD(&fs_info->async_submit_work_list);
+       INIT_LIST_HEAD(&fs_info->delalloc_inodes);
        spin_lock_init(&fs_info->hash_lock);
-       spin_lock_init(&fs_info->end_io_work_lock);
-       spin_lock_init(&fs_info->async_submit_work_lock);
        spin_lock_init(&fs_info->delalloc_lock);
        spin_lock_init(&fs_info->new_trans_lock);
+       spin_lock_init(&fs_info->ref_cache_lock);
 
        init_completion(&fs_info->kobj_unregister);
-       sb_set_blocksize(sb, BTRFS_SUPER_INFO_SIZE);
        fs_info->tree_root = tree_root;
        fs_info->extent_root = extent_root;
        fs_info->chunk_root = chunk_root;
@@ -1166,6 +1453,12 @@ struct btrfs_root *open_ctree(struct super_block *sb,
        INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots);
        INIT_LIST_HEAD(&fs_info->space_info);
        btrfs_mapping_init(&fs_info->mapping_tree);
+       atomic_set(&fs_info->nr_async_submits, 0);
+       atomic_set(&fs_info->async_delalloc_pages, 0);
+       atomic_set(&fs_info->async_submit_draining, 0);
+       atomic_set(&fs_info->nr_async_bios, 0);
+       atomic_set(&fs_info->throttles, 0);
+       atomic_set(&fs_info->throttle_gen, 0);
        fs_info->sb = sb;
        fs_info->max_extent = (u64)-1;
        fs_info->max_inline = 8192 * 1024;
@@ -1174,6 +1467,14 @@ struct btrfs_root *open_ctree(struct super_block *sb,
        fs_info->btree_inode->i_ino = 1;
        fs_info->btree_inode->i_nlink = 1;
 
+       fs_info->thread_pool_size = min(num_online_cpus() + 2, 8);
+
+       INIT_LIST_HEAD(&fs_info->ordered_extents);
+       spin_lock_init(&fs_info->ordered_extent_lock);
+
+       sb->s_blocksize = 4096;
+       sb->s_blocksize_bits = blksize_bits(4096);
+
        /*
         * we set the i_size on the btree inode to the max possible int.
         * the real end of the address space is determined by all of
@@ -1191,10 +1492,9 @@ struct btrfs_root *open_ctree(struct super_block *sb,
 
        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_io_tree_init(&fs_info->block_group_cache,
-                            fs_info->btree_inode->i_mapping, GFP_NOFS);
+       spin_lock_init(&fs_info->block_group_cache_lock);
+       fs_info->block_group_cache_tree.rb_node = NULL;
+
        extent_io_tree_init(&fs_info->pinned_extents,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
        extent_io_tree_init(&fs_info->pending_del,
@@ -1203,24 +1503,32 @@ struct btrfs_root *open_ctree(struct super_block *sb,
                             fs_info->btree_inode->i_mapping, GFP_NOFS);
        fs_info->do_barriers = 1;
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-       INIT_WORK(&fs_info->end_io_work, btrfs_end_io_csum, fs_info);
-       INIT_WORK(&fs_info->async_submit_work, btrfs_async_submit_work,
-                 fs_info);
-       INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info);
-#else
-       INIT_WORK(&fs_info->end_io_work, btrfs_end_io_csum);
-       INIT_WORK(&fs_info->async_submit_work, btrfs_async_submit_work);
-       INIT_DELAYED_WORK(&fs_info->trans_work, btrfs_transaction_cleaner);
-#endif
+       INIT_LIST_HEAD(&fs_info->dead_reloc_roots);
+       btrfs_leaf_ref_tree_init(&fs_info->reloc_ref_tree);
+       btrfs_leaf_ref_tree_init(&fs_info->shared_ref_tree);
+
        BTRFS_I(fs_info->btree_inode)->root = tree_root;
        memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
               sizeof(struct btrfs_key));
        insert_inode_hash(fs_info->btree_inode);
-       mapping_set_gfp_mask(fs_info->btree_inode->i_mapping, GFP_NOFS);
 
        mutex_init(&fs_info->trans_mutex);
-       mutex_init(&fs_info->fs_mutex);
+       mutex_init(&fs_info->tree_log_mutex);
+       mutex_init(&fs_info->drop_mutex);
+       mutex_init(&fs_info->extent_ins_mutex);
+       mutex_init(&fs_info->pinned_mutex);
+       mutex_init(&fs_info->chunk_mutex);
+       mutex_init(&fs_info->transaction_kthread_mutex);
+       mutex_init(&fs_info->cleaner_mutex);
+       mutex_init(&fs_info->volume_mutex);
+       mutex_init(&fs_info->tree_reloc_mutex);
+       init_waitqueue_head(&fs_info->transaction_throttle);
+       init_waitqueue_head(&fs_info->transaction_wait);
+       init_waitqueue_head(&fs_info->async_submit_wait);
+       init_waitqueue_head(&fs_info->tree_log_wait);
+       atomic_set(&fs_info->tree_log_commit, 0);
+       atomic_set(&fs_info->tree_log_writers, 0);
+       fs_info->tree_log_transid = 0;
 
 #if 0
        ret = add_hasher(fs_info, "crc32c");
@@ -1233,31 +1541,88 @@ struct btrfs_root *open_ctree(struct super_block *sb,
        __setup_root(4096, 4096, 4096, 4096, tree_root,
                     fs_info, BTRFS_ROOT_TREE_OBJECTID);
 
-       fs_info->sb_buffer = read_tree_block(tree_root,
-                                            BTRFS_SUPER_INFO_OFFSET,
-                                            4096);
 
-       if (!fs_info->sb_buffer)
+       bh = __bread(fs_devices->latest_bdev,
+                    BTRFS_SUPER_INFO_OFFSET / 4096, 4096);
+       if (!bh)
                goto fail_iput;
 
-       read_extent_buffer(fs_info->sb_buffer, &fs_info->super_copy, 0,
-                          sizeof(fs_info->super_copy));
+       memcpy(&fs_info->super_copy, bh->b_data, sizeof(fs_info->super_copy));
+       brelse(bh);
 
-       read_extent_buffer(fs_info->sb_buffer, fs_info->fsid,
-                          (unsigned long)btrfs_super_fsid(fs_info->sb_buffer),
-                          BTRFS_FSID_SIZE);
+       memcpy(fs_info->fsid, fs_info->super_copy.fsid, BTRFS_FSID_SIZE);
 
        disk_super = &fs_info->super_copy;
        if (!btrfs_super_root(disk_super))
                goto fail_sb_buffer;
 
-       if (btrfs_super_num_devices(disk_super) != fs_devices->num_devices) {
+       err = btrfs_parse_options(tree_root, options);
+       if (err)
+               goto fail_sb_buffer;
+
+       /*
+        * we need to start all the end_io workers up front because the
+        * queue work function gets called at interrupt time, and so it
+        * cannot dynamically grow.
+        */
+       btrfs_init_workers(&fs_info->workers, "worker",
+                          fs_info->thread_pool_size);
+
+       btrfs_init_workers(&fs_info->delalloc_workers, "delalloc",
+                          fs_info->thread_pool_size);
+
+       btrfs_init_workers(&fs_info->submit_workers, "submit",
+                          min_t(u64, fs_devices->num_devices,
+                          fs_info->thread_pool_size));
+
+       /* a higher idle thresh on the submit workers makes it much more
+        * likely that bios will be send down in a sane order to the
+        * devices
+        */
+       fs_info->submit_workers.idle_thresh = 64;
+
+       fs_info->workers.idle_thresh = 16;
+       fs_info->workers.ordered = 1;
+
+       fs_info->delalloc_workers.idle_thresh = 2;
+       fs_info->delalloc_workers.ordered = 1;
+
+       btrfs_init_workers(&fs_info->fixup_workers, "fixup", 1);
+       btrfs_init_workers(&fs_info->endio_workers, "endio",
+                          fs_info->thread_pool_size);
+       btrfs_init_workers(&fs_info->endio_write_workers, "endio-write",
+                          fs_info->thread_pool_size);
+
+       /*
+        * endios are largely parallel and should have a very
+        * low idle thresh
+        */
+       fs_info->endio_workers.idle_thresh = 4;
+       fs_info->endio_write_workers.idle_thresh = 64;
+
+       btrfs_start_workers(&fs_info->workers, 1);
+       btrfs_start_workers(&fs_info->submit_workers, 1);
+       btrfs_start_workers(&fs_info->delalloc_workers, 1);
+       btrfs_start_workers(&fs_info->fixup_workers, 1);
+       btrfs_start_workers(&fs_info->endio_workers, fs_info->thread_pool_size);
+       btrfs_start_workers(&fs_info->endio_write_workers,
+                           fs_info->thread_pool_size);
+
+       err = -EINVAL;
+       if (btrfs_super_num_devices(disk_super) > fs_devices->open_devices) {
                printk("Btrfs: wanted %llu devices, but found %llu\n",
                       (unsigned long long)btrfs_super_num_devices(disk_super),
-                      (unsigned long long)fs_devices->num_devices);
-               goto fail_sb_buffer;
+                      (unsigned long long)fs_devices->open_devices);
+               if (btrfs_test_opt(tree_root, DEGRADED))
+                       printk("continuing in degraded mode\n");
+               else {
+                       goto fail_sb_buffer;
+               }
        }
+
        fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);
+       fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages,
+                                   4 * 1024 * 1024 / PAGE_CACHE_SIZE);
 
        nodesize = btrfs_super_nodesize(disk_super);
        leafsize = btrfs_super_leafsize(disk_super);
@@ -1267,7 +1632,9 @@ struct btrfs_root *open_ctree(struct super_block *sb,
        tree_root->leafsize = leafsize;
        tree_root->sectorsize = sectorsize;
        tree_root->stripesize = stripesize;
-       sb_set_blocksize(sb, sectorsize);
+
+       sb->s_blocksize = sectorsize;
+       sb->s_blocksize_bits = blksize_bits(sectorsize);
 
        if (strncmp((char *)(&disk_super->magic), BTRFS_MAGIC,
                    sizeof(disk_super->magic))) {
@@ -1275,9 +1642,9 @@ struct btrfs_root *open_ctree(struct super_block *sb,
                goto fail_sb_buffer;
        }
 
-       mutex_lock(&fs_info->fs_mutex);
-
+       mutex_lock(&fs_info->chunk_mutex);
        ret = btrfs_read_sys_array(tree_root);
+       mutex_unlock(&fs_info->chunk_mutex);
        if (ret) {
                printk("btrfs: failed to read the system array on %s\n",
                       sb->s_id);
@@ -1286,29 +1653,34 @@ struct btrfs_root *open_ctree(struct super_block *sb,
 
        blocksize = btrfs_level_size(tree_root,
                                     btrfs_super_chunk_root_level(disk_super));
+       generation = btrfs_super_chunk_root_generation(disk_super);
 
        __setup_root(nodesize, leafsize, sectorsize, stripesize,
                     chunk_root, fs_info, BTRFS_CHUNK_TREE_OBJECTID);
 
        chunk_root->node = read_tree_block(chunk_root,
                                           btrfs_super_chunk_root(disk_super),
-                                          blocksize);
+                                          blocksize, generation);
        BUG_ON(!chunk_root->node);
 
        read_extent_buffer(chunk_root->node, fs_info->chunk_tree_uuid,
                 (unsigned long)btrfs_header_chunk_tree_uuid(chunk_root->node),
                 BTRFS_UUID_SIZE);
 
+       mutex_lock(&fs_info->chunk_mutex);
        ret = btrfs_read_chunk_tree(chunk_root);
+       mutex_unlock(&fs_info->chunk_mutex);
        BUG_ON(ret);
 
+       btrfs_close_extra_devices(fs_devices);
+
        blocksize = btrfs_level_size(tree_root,
                                     btrfs_super_root_level(disk_super));
-
+       generation = btrfs_super_generation(disk_super);
 
        tree_root->node = read_tree_block(tree_root,
                                          btrfs_super_root(disk_super),
-                                         blocksize);
+                                         blocksize, generation);
        if (!tree_root->node)
                goto fail_sb_buffer;
 
@@ -1332,31 +1704,70 @@ struct btrfs_root *open_ctree(struct super_block *sb,
        fs_info->data_alloc_profile = (u64)-1;
        fs_info->metadata_alloc_profile = (u64)-1;
        fs_info->system_alloc_profile = fs_info->metadata_alloc_profile;
+       fs_info->cleaner_kthread = kthread_run(cleaner_kthread, tree_root,
+                                              "btrfs-cleaner");
+       if (!fs_info->cleaner_kthread)
+               goto fail_extent_root;
+
+       fs_info->transaction_kthread = kthread_run(transaction_kthread,
+                                                  tree_root,
+                                                  "btrfs-transaction");
+       if (!fs_info->transaction_kthread)
+               goto fail_cleaner;
+
+       if (btrfs_super_log_root(disk_super) != 0) {
+               u32 blocksize;
+               u64 bytenr = btrfs_super_log_root(disk_super);
+
+               blocksize =
+                    btrfs_level_size(tree_root,
+                                     btrfs_super_log_root_level(disk_super));
+
+               log_tree_root = kzalloc(sizeof(struct btrfs_root),
+                                                     GFP_NOFS);
+
+               __setup_root(nodesize, leafsize, sectorsize, stripesize,
+                            log_tree_root, fs_info, BTRFS_TREE_LOG_OBJECTID);
+
+               log_tree_root->node = read_tree_block(tree_root, bytenr,
+                                                     blocksize,
+                                                     generation + 1);
+               ret = btrfs_recover_log_trees(log_tree_root);
+               BUG_ON(ret);
+       }
+       fs_info->last_trans_committed = btrfs_super_generation(disk_super);
+
+       ret = btrfs_cleanup_reloc_trees(tree_root);
+       BUG_ON(ret);
 
-       mutex_unlock(&fs_info->fs_mutex);
        return tree_root;
 
+fail_cleaner:
+       kthread_stop(fs_info->cleaner_kthread);
 fail_extent_root:
        free_extent_buffer(extent_root->node);
 fail_tree_root:
        free_extent_buffer(tree_root->node);
 fail_sys_array:
-       mutex_unlock(&fs_info->fs_mutex);
 fail_sb_buffer:
-       free_extent_buffer(fs_info->sb_buffer);
-       extent_io_tree_empty_lru(&BTRFS_I(fs_info->btree_inode)->io_tree);
+       btrfs_stop_workers(&fs_info->fixup_workers);
+       btrfs_stop_workers(&fs_info->delalloc_workers);
+       btrfs_stop_workers(&fs_info->workers);
+       btrfs_stop_workers(&fs_info->endio_workers);
+       btrfs_stop_workers(&fs_info->endio_write_workers);
+       btrfs_stop_workers(&fs_info->submit_workers);
 fail_iput:
        iput(fs_info->btree_inode);
 fail:
-       close_all_devices(fs_info);
+       btrfs_close_devices(fs_info->fs_devices);
        btrfs_mapping_tree_free(&fs_info->mapping_tree);
 
        kfree(extent_root);
        kfree(tree_root);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
        bdi_destroy(&fs_info->bdi);
-#endif
        kfree(fs_info);
+       kfree(chunk_root);
+       kfree(dev_root);
        return ERR_PTR(err);
 }
 
@@ -1372,7 +1783,9 @@ static void btrfs_end_buffer_write_sync(struct buffer_head *bh, int uptodate)
                                        "I/O error on %s\n",
                                       bdevname(bh->b_bdev, b));
                }
-               set_buffer_write_io_error(bh);
+               /* note, we dont' set_buffer_write_io_error because we have
+                * our own ways of dealing with the IO errors
+                */
                clear_buffer_uptodate(bh);
        }
        unlock_buffer(bh);
@@ -1384,38 +1797,51 @@ int write_all_supers(struct btrfs_root *root)
        struct list_head *cur;
        struct list_head *head = &root->fs_info->fs_devices->devices;
        struct btrfs_device *dev;
-       struct extent_buffer *sb;
+       struct btrfs_super_block *sb;
        struct btrfs_dev_item *dev_item;
        struct buffer_head *bh;
        int ret;
        int do_barriers;
+       int max_errors;
+       int total_errors = 0;
+       u32 crc;
+       u64 flags;
 
+       max_errors = btrfs_super_num_devices(&root->fs_info->super_copy) - 1;
        do_barriers = !btrfs_test_opt(root, NOBARRIER);
 
-       sb = root->fs_info->sb_buffer;
-       dev_item = (struct btrfs_dev_item *)offsetof(struct btrfs_super_block,
-                                                     dev_item);
+       sb = &root->fs_info->super_for_commit;
+       dev_item = &sb->dev_item;
        list_for_each(cur, head) {
                dev = list_entry(cur, struct btrfs_device, dev_list);
-               btrfs_set_device_type(sb, dev_item, dev->type);
-               btrfs_set_device_id(sb, dev_item, dev->devid);
-               btrfs_set_device_total_bytes(sb, dev_item, dev->total_bytes);
-               btrfs_set_device_bytes_used(sb, dev_item, dev->bytes_used);
-               btrfs_set_device_io_align(sb, dev_item, dev->io_align);
-               btrfs_set_device_io_width(sb, dev_item, dev->io_width);
-               btrfs_set_device_sector_size(sb, dev_item, dev->sector_size);
-               write_extent_buffer(sb, dev->uuid,
-                                   (unsigned long)btrfs_device_uuid(dev_item),
-                                   BTRFS_UUID_SIZE);
-
-               btrfs_set_header_flag(sb, BTRFS_HEADER_FLAG_WRITTEN);
-               csum_tree_block(root, sb, 0);
-
-               bh = __getblk(dev->bdev, BTRFS_SUPER_INFO_OFFSET /
-                             root->fs_info->sb->s_blocksize,
+               if (!dev->bdev) {
+                       total_errors++;
+                       continue;
+               }
+               if (!dev->in_fs_metadata)
+                       continue;
+
+               btrfs_set_stack_device_type(dev_item, dev->type);
+               btrfs_set_stack_device_id(dev_item, dev->devid);
+               btrfs_set_stack_device_total_bytes(dev_item, dev->total_bytes);
+               btrfs_set_stack_device_bytes_used(dev_item, dev->bytes_used);
+               btrfs_set_stack_device_io_align(dev_item, dev->io_align);
+               btrfs_set_stack_device_io_width(dev_item, dev->io_width);
+               btrfs_set_stack_device_sector_size(dev_item, dev->sector_size);
+               memcpy(dev_item->uuid, dev->uuid, BTRFS_UUID_SIZE);
+               flags = btrfs_super_flags(sb);
+               btrfs_set_super_flags(sb, flags | BTRFS_HEADER_FLAG_WRITTEN);
+
+
+               crc = ~(u32)0;
+               crc = btrfs_csum_data(root, (char *)sb + BTRFS_CSUM_SIZE, crc,
+                                     BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
+               btrfs_csum_final(crc, sb->csum);
+
+               bh = __getblk(dev->bdev, BTRFS_SUPER_INFO_OFFSET / 4096,
                              BTRFS_SUPER_INFO_SIZE);
 
-               read_extent_buffer(sb, bh->b_data, 0, BTRFS_SUPER_INFO_SIZE);
+               memcpy(bh->b_data, sb, BTRFS_SUPER_INFO_SIZE);
                dev->pending_io = bh;
 
                get_bh(bh);
@@ -1437,11 +1863,22 @@ int write_all_supers(struct btrfs_root *root)
                } else {
                        ret = submit_bh(WRITE, bh);
                }
-               BUG_ON(ret);
+               if (ret)
+                       total_errors++;
+       }
+       if (total_errors > max_errors) {
+               printk("btrfs: %d errors while writing supers\n", total_errors);
+               BUG();
        }
+       total_errors = 0;
 
        list_for_each(cur, head) {
                dev = list_entry(cur, struct btrfs_device, dev_list);
+               if (!dev->bdev)
+                       continue;
+               if (!dev->in_fs_metadata)
+                       continue;
+
                BUG_ON(!dev->pending_io);
                bh = dev->pending_io;
                wait_on_buffer(bh);
@@ -1456,15 +1893,20 @@ int write_all_supers(struct btrfs_root *root)
                                ret = submit_bh(WRITE, bh);
                                BUG_ON(ret);
                                wait_on_buffer(bh);
-                               BUG_ON(!buffer_uptodate(bh));
+                               if (!buffer_uptodate(bh))
+                                       total_errors++;
                        } else {
-                               BUG();
+                               total_errors++;
                        }
 
                }
                dev->pending_io = NULL;
                brelse(bh);
        }
+       if (total_errors > max_errors) {
+               printk("btrfs: %d errors while writing supers\n", total_errors);
+               BUG();
+       }
        return 0;
 }
 
@@ -1474,15 +1916,6 @@ int write_ctree_super(struct btrfs_trans_handle *trans, struct btrfs_root
        int ret;
 
        ret = write_all_supers(root);
-#if 0
-       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);
-#endif
        return ret;
 }
 
@@ -1529,9 +1962,12 @@ int close_ctree(struct btrfs_root *root)
        struct btrfs_fs_info *fs_info = root->fs_info;
 
        fs_info->closing = 1;
-       btrfs_transaction_flush_work(root);
-       mutex_lock(&fs_info->fs_mutex);
-       btrfs_defrag_dirty_roots(root->fs_info);
+       smp_mb();
+
+       kthread_stop(root->fs_info->transaction_kthread);
+       kthread_stop(root->fs_info->cleaner_kthread);
+
+       btrfs_clean_old_snapshots(root);
        trans = btrfs_start_transaction(root, 1);
        ret = btrfs_commit_transaction(trans, root);
        /* run commit again to  drop the original snapshot */
@@ -1539,15 +1975,18 @@ int close_ctree(struct btrfs_root *root)
        btrfs_commit_transaction(trans, root);
        ret = btrfs_write_and_wait_transaction(NULL, root);
        BUG_ON(ret);
-       write_ctree_super(NULL, root);
-       mutex_unlock(&fs_info->fs_mutex);
 
-       btrfs_transaction_flush_work(root);
+       write_ctree_super(NULL, root);
 
        if (fs_info->delalloc_bytes) {
                printk("btrfs: at unmount delalloc count %Lu\n",
                       fs_info->delalloc_bytes);
        }
+       if (fs_info->total_ref_cache_size) {
+               printk("btrfs: at umount reference cache size %Lu\n",
+                       fs_info->total_ref_cache_size);
+       }
+
        if (fs_info->extent_root->node)
                free_extent_buffer(fs_info->extent_root->node);
 
@@ -1560,30 +1999,20 @@ int close_ctree(struct btrfs_root *root)
        if (root->fs_info->dev_root->node);
                free_extent_buffer(root->fs_info->dev_root->node);
 
-       free_extent_buffer(fs_info->sb_buffer);
-
        btrfs_free_block_groups(root->fs_info);
+       fs_info->closing = 2;
        del_fs_roots(fs_info);
 
        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);
-
-       flush_workqueue(end_io_workqueue);
-       flush_workqueue(async_submit_workqueue);
-
        truncate_inode_pages(fs_info->btree_inode->i_mapping, 0);
 
-       flush_workqueue(end_io_workqueue);
-       destroy_workqueue(end_io_workqueue);
-
-       flush_workqueue(async_submit_workqueue);
-       destroy_workqueue(async_submit_workqueue);
+       btrfs_stop_workers(&fs_info->fixup_workers);
+       btrfs_stop_workers(&fs_info->delalloc_workers);
+       btrfs_stop_workers(&fs_info->workers);
+       btrfs_stop_workers(&fs_info->endio_workers);
+       btrfs_stop_workers(&fs_info->endio_write_workers);
+       btrfs_stop_workers(&fs_info->submit_workers);
 
        iput(fs_info->btree_inode);
 #if 0
@@ -1596,12 +2025,10 @@ int close_ctree(struct btrfs_root *root)
                kfree(hasher);
        }
 #endif
-       close_all_devices(fs_info);
+       btrfs_close_devices(fs_info->fs_devices);
        btrfs_mapping_tree_free(&fs_info->mapping_tree);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
        bdi_destroy(&fs_info->bdi);
-#endif
 
        kfree(fs_info->extent_root);
        kfree(fs_info->tree_root);
@@ -1610,10 +2037,18 @@ int close_ctree(struct btrfs_root *root)
        return 0;
 }
 
-int btrfs_buffer_uptodate(struct extent_buffer *buf)
+int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid)
 {
+       int ret;
        struct inode *btree_inode = buf->first_page->mapping->host;
-       return extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree, buf);
+
+       ret = extent_buffer_uptodate(&BTRFS_I(btree_inode)->io_tree, buf);
+       if (!ret)
+               return ret;
+
+       ret = verify_parent_transid(&BTRFS_I(btree_inode)->io_tree, buf,
+                                   parent_transid);
+       return !ret;
 }
 
 int btrfs_set_buffer_uptodate(struct extent_buffer *buf)
@@ -1629,6 +2064,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
        u64 transid = btrfs_header_generation(buf);
        struct inode *btree_inode = root->fs_info->btree_inode;
 
+       WARN_ON(!btrfs_tree_locked(buf));
        if (transid != root->fs_info->generation) {
                printk(KERN_CRIT "transid mismatch buffer %llu, found %Lu running %Lu\n",
                        (unsigned long long)buf->start,
@@ -1638,91 +2074,71 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *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)
 {
-       balance_dirty_pages_ratelimited_nr(
-                                  root->fs_info->btree_inode->i_mapping, 1);
-}
+       /*
+        * looks as though older kernels can get into trouble with
+        * this code, they end up stuck in balance_dirty_pages forever
+        */
+       struct extent_io_tree *tree;
+       u64 num_dirty;
+       u64 start = 0;
+       unsigned long thresh = 32 * 1024 * 1024;
+       tree = &BTRFS_I(root->fs_info->btree_inode)->io_tree;
 
-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)->io_tree, buf->start,
-                       buf->start + buf->len - 1, EXTENT_DEFRAG, GFP_NOFS);
-}
+       if (current_is_pdflush() || current->flags & PF_MEMALLOC)
+               return;
 
-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)->io_tree, buf->start,
-                       buf->start + buf->len - 1, EXTENT_DEFRAG_DONE,
-                       GFP_NOFS);
+       num_dirty = count_range_bits(tree, &start, (u64)-1,
+                                    thresh, EXTENT_DIRTY);
+       if (num_dirty > thresh) {
+               balance_dirty_pages_ratelimited_nr(
+                                  root->fs_info->btree_inode->i_mapping, 1);
+       }
+       return;
 }
 
-int btrfs_buffer_defrag(struct extent_buffer *buf)
+int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid)
 {
        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)->io_tree,
-                    buf->start, buf->start + buf->len - 1, EXTENT_DEFRAG, 0);
+       int ret;
+       ret = btree_read_extent_buffer_pages(root, buf, 0, parent_transid);
+       if (ret == 0) {
+               buf->flags |= EXTENT_UPTODATE;
+       }
+       return ret;
 }
 
-int btrfs_buffer_defrag_done(struct extent_buffer *buf)
+int btree_lock_page_hook(struct page *page)
 {
-       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)->io_tree,
-                    buf->start, buf->start + buf->len - 1,
-                    EXTENT_DEFRAG_DONE, 0);
-}
+       struct inode *inode = page->mapping->host;
+       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
+       struct extent_buffer *eb;
+       unsigned long len;
+       u64 bytenr = page_offset(page);
 
-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)->io_tree,
-                    buf->start, buf->start + buf->len - 1,
-                    EXTENT_DEFRAG_DONE, GFP_NOFS);
-}
+       if (page->private == EXTENT_PAGE_PRIVATE)
+               goto out;
 
-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)->io_tree,
-                    buf->start, buf->start + buf->len - 1,
-                    EXTENT_DEFRAG, GFP_NOFS);
-}
+       len = page->private >> 2;
+       eb = find_extent_buffer(io_tree, bytenr, len, GFP_NOFS);
+       if (!eb)
+               goto out;
 
-int btrfs_read_buffer(struct extent_buffer *buf)
-{
-       struct btrfs_root *root = BTRFS_I(buf->first_page->mapping->host)->root;
-       int ret;
-       ret = btree_read_extent_buffer_pages(root, buf, 0);
-       if (ret == 0) {
-               buf->flags |= EXTENT_UPTODATE;
-       }
-       return ret;
+       btrfs_tree_lock(eb);
+       spin_lock(&root->fs_info->hash_lock);
+       btrfs_set_header_flag(eb, BTRFS_HEADER_FLAG_WRITTEN);
+       spin_unlock(&root->fs_info->hash_lock);
+       btrfs_tree_unlock(eb);
+       free_extent_buffer(eb);
+out:
+       lock_page(page);
+       return 0;
 }
 
 static struct extent_io_ops btree_extent_io_ops = {
-       .writepage_io_hook = btree_writepage_io_hook,
+       .write_cache_pages_lock_hook = btree_lock_page_hook,
        .readpage_end_io_hook = btree_readpage_end_io_hook,
        .submit_bio_hook = btree_submit_bio_hook,
        /* note we're sharing with inode.c for the merge bio hook */