1 files changed, 42 insertions, 9 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 974be09e7556..e99ccd6ffb2c 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -42,6 +42,7 @@
 #include "locking.h"
 #include "tree-log.h"
 #include "free-space-cache.h"
+#include "free-space-tree.h"
 #include "inode-map.h"
 #include "check-integrity.h"
 #include "rcu-string.h"
@@ -362,7 +363,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
         }
 
         lock_extent_bits(io_tree, eb->start, eb->start + eb->len - 1,
-                         0, &cached_state);
+                         &cached_state);
         if (extent_buffer_uptodate(eb) &&
             btrfs_header_generation(eb) == parent_transid) {
                 ret = 0;
@@ -923,7 +924,7 @@ static int check_async_write(struct inode *inode, unsigned long bio_flags)
         if (bio_flags & EXTENT_BIO_TREE_LOG)
                 return 0;
 #ifdef CONFIG_X86
-        if (cpu_has_xmm4_2)
+        if (static_cpu_has_safe(X86_FEATURE_XMM4_2))
                 return 0;
 #endif
         return 1;
@@ -1650,6 +1651,9 @@ struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
         if (location->objectid == BTRFS_UUID_TREE_OBJECTID)
                 return fs_info->uuid_root ? fs_info->uuid_root :
                                             ERR_PTR(-ENOENT);
+        if (location->objectid == BTRFS_FREE_SPACE_TREE_OBJECTID)
+                return fs_info->free_space_root ? fs_info->free_space_root :
+                                                  ERR_PTR(-ENOENT);
 again:
         root = btrfs_lookup_fs_root(fs_info, location->objectid);
         if (root) {
@@ -2148,6 +2152,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root)
         free_root_extent_buffers(info->uuid_root);
         if (chunk_root)
                 free_root_extent_buffers(info->chunk_root);
+        free_root_extent_buffers(info->free_space_root);
 }
 
 void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info)
@@ -2448,6 +2453,15 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info,
                 fs_info->uuid_root = root;
         }
 
+        if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
+                location.objectid = BTRFS_FREE_SPACE_TREE_OBJECTID;
+                root = btrfs_read_tree_root(tree_root, &location);
+                if (IS_ERR(root))
+                        return PTR_ERR(root);
+                set_bit(BTRFS_ROOT_TRACK_DIRTY, &root->state);
+                fs_info->free_space_root = root;
+        }
+
         return 0;
 }
 
@@ -2668,6 +2682,7 @@ int open_ctree(struct super_block *sb,
         if (btrfs_check_super_csum(bh->b_data)) {
                 printk(KERN_ERR "BTRFS: superblock checksum mismatch\n");
                 err = -EINVAL;
+                brelse(bh);
                 goto fail_alloc;
         }
 
@@ -2809,7 +2824,7 @@ int open_ctree(struct super_block *sb,
 
         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);
+                                    SZ_4M / PAGE_CACHE_SIZE);
 
         tree_root->nodesize = nodesize;
         tree_root->sectorsize = sectorsize;
@@ -3051,6 +3066,18 @@ retry_root_backup:
         if (sb->s_flags & MS_RDONLY)
                 return 0;
 
+        if (btrfs_test_opt(tree_root, FREE_SPACE_TREE) &&
+            !btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
+                pr_info("BTRFS: creating free space tree\n");
+                ret = btrfs_create_free_space_tree(fs_info);
+                if (ret) {
+                        pr_warn("BTRFS: failed to create free space tree %d\n",
+                                ret);
+                        close_ctree(tree_root);
+                        return ret;
+                }
+        }
+
         down_read(&fs_info->cleanup_work_sem);
         if ((ret = btrfs_orphan_cleanup(fs_info->fs_root)) ||
             (ret = btrfs_orphan_cleanup(fs_info->tree_root))) {
@@ -3076,6 +3103,18 @@ retry_root_backup:
 
         btrfs_qgroup_rescan_resume(fs_info);
 
+        if (btrfs_test_opt(tree_root, CLEAR_CACHE) &&
+            btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) {
+                pr_info("BTRFS: clearing free space tree\n");
+                ret = btrfs_clear_free_space_tree(fs_info);
+                if (ret) {
+                        pr_warn("BTRFS: failed to clear free space tree %d\n",
+                                ret);
+                        close_ctree(tree_root);
+                        return ret;
+                }
+        }
+
         if (!fs_info->uuid_root) {
                 pr_info("BTRFS: creating UUID tree\n");
                 ret = btrfs_create_uuid_tree(fs_info);
@@ -3902,11 +3941,6 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
         return !ret;
 }
 
-int btrfs_set_buffer_uptodate(struct extent_buffer *buf)
-{
-        return set_extent_buffer_uptodate(buf);
-}
-
 void btrfs_mark_buffer_dirty(struct extent_buffer *buf)
 {
         struct btrfs_root *root;
@@ -3962,7 +3996,6 @@ static void __btrfs_btree_balance_dirty(struct btrfs_root *root,
                 balance_dirty_pages_ratelimited(
                                    root->fs_info->btree_inode->i_mapping);
         }
-        return;
 }
 
 void btrfs_btree_balance_dirty(struct btrfs_root *root)