Btrfs: Reinstate '-osubvol=.' option to mount entire tree
[safe/jmp/linux-2.6] / fs / btrfs / super.c
index ec68999..f7b3eac 100644 (file)
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2007 Oracle.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/buffer_head.h>
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>
 #include <linux/backing-dev.h>
+#include <linux/mount.h>
 #include <linux/mpage.h>
 #include <linux/swap.h>
 #include <linux/writeback.h>
+#include <linux/statfs.h>
+#include <linux/compat.h>
+#include <linux/parser.h>
+#include <linux/ctype.h>
+#include <linux/namei.h>
+#include <linux/miscdevice.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
 #include "btrfs_inode.h"
 #include "ioctl.h"
+#include "print-tree.h"
+#include "xattr.h"
+#include "volumes.h"
+#include "version.h"
+#include "export.h"
 
-void btrfs_fsinfo_release(struct kobject *obj)
-{
-       struct btrfs_fs_info *fsinfo = container_of(obj,
-                                           struct btrfs_fs_info, kobj);
-       kfree(fsinfo);
-}
-
-struct kobj_type btrfs_fsinfo_ktype = {
-       .release = btrfs_fsinfo_release,
-};
-
-struct btrfs_iget_args {
-       u64 ino;
-       struct btrfs_root *root;
-};
-
-decl_subsys(btrfs, &btrfs_fsinfo_ktype, NULL);
-
-#define BTRFS_SUPER_MAGIC 0x9123682E
+#define BTRFS_SUPER_MAGIC 0x9123683E
 
-static struct inode_operations btrfs_dir_inode_operations;
-static struct inode_operations btrfs_dir_ro_inode_operations;
 static struct super_operations btrfs_super_ops;
-static struct file_operations btrfs_dir_file_operations;
-static struct inode_operations btrfs_file_inode_operations;
-static struct address_space_operations btrfs_aops;
-static struct file_operations btrfs_file_operations;
 
-static void btrfs_read_locked_inode(struct inode *inode)
+static void btrfs_put_super (struct super_block * sb)
 {
-       struct btrfs_path *path;
-       struct btrfs_inode_item *inode_item;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_key location;
+       struct btrfs_root *root = btrfs_sb(sb);
+       struct btrfs_fs_info *fs = root->fs_info;
        int ret;
 
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       mutex_lock(&root->fs_info->fs_mutex);
-
-       memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));
-       ret = btrfs_lookup_inode(NULL, root, path, &location, 0);
+       ret = close_ctree(root);
        if (ret) {
-               btrfs_free_path(path);
-               goto make_bad;
-       }
-       inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                                 path->slots[0],
-                                 struct btrfs_inode_item);
-
-       inode->i_mode = btrfs_inode_mode(inode_item);
-       inode->i_nlink = btrfs_inode_nlink(inode_item);
-       inode->i_uid = btrfs_inode_uid(inode_item);
-       inode->i_gid = btrfs_inode_gid(inode_item);
-       inode->i_size = btrfs_inode_size(inode_item);
-       inode->i_atime.tv_sec = btrfs_timespec_sec(&inode_item->atime);
-       inode->i_atime.tv_nsec = btrfs_timespec_nsec(&inode_item->atime);
-       inode->i_mtime.tv_sec = btrfs_timespec_sec(&inode_item->mtime);
-       inode->i_mtime.tv_nsec = btrfs_timespec_nsec(&inode_item->mtime);
-       inode->i_ctime.tv_sec = btrfs_timespec_sec(&inode_item->ctime);
-       inode->i_ctime.tv_nsec = btrfs_timespec_nsec(&inode_item->ctime);
-       inode->i_blocks = btrfs_inode_nblocks(inode_item);
-       inode->i_generation = btrfs_inode_generation(inode_item);
-
-       btrfs_free_path(path);
-       inode_item = NULL;
-
-       mutex_unlock(&root->fs_info->fs_mutex);
-
-       switch (inode->i_mode & S_IFMT) {
-#if 0
-       default:
-               init_special_inode(inode, inode->i_mode,
-                                  btrfs_inode_rdev(inode_item));
-               break;
-#endif
-       case S_IFREG:
-               inode->i_mapping->a_ops = &btrfs_aops;
-               inode->i_fop = &btrfs_file_operations;
-               inode->i_op = &btrfs_file_inode_operations;
-               break;
-       case S_IFDIR:
-               inode->i_fop = &btrfs_dir_file_operations;
-               if (root == root->fs_info->tree_root)
-                       inode->i_op = &btrfs_dir_ro_inode_operations;
-               else
-                       inode->i_op = &btrfs_dir_inode_operations;
-               break;
-       case S_IFLNK:
-               // inode->i_op = &page_symlink_inode_operations;
-               break;
-       }
-       return;
-
-make_bad:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       make_bad_inode(inode);
-}
-
-static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
-                             struct btrfs_root *root,
-                             struct inode *dir,
-                             struct dentry *dentry)
-{
-       struct btrfs_path *path;
-       const char *name = dentry->d_name.name;
-       int name_len = dentry->d_name.len;
-       int ret;
-       u64 objectid;
-       struct btrfs_dir_item *di;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       ret = btrfs_lookup_dir_item(trans, root, path, dir->i_ino,
-                                   name, name_len, -1);
-       if (ret < 0)
-               goto err;
-       if (ret > 0) {
-               ret = -ENOENT;
-               goto err;
-       }
-       di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
-                           struct btrfs_dir_item);
-       objectid = btrfs_disk_key_objectid(&di->location);
-
-       ret = btrfs_del_item(trans, root, path);
-       BUG_ON(ret);
-
-       btrfs_release_path(root, path);
-       ret = btrfs_lookup_dir_index_item(trans, root, path, dir->i_ino,
-                                         objectid, -1);
-       BUG_ON(ret);
-       ret = btrfs_del_item(trans, root, path);
-       BUG_ON(ret);
-       dentry->d_inode->i_ctime = dir->i_ctime;
-err:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       if (ret == 0) {
-               inode_dec_link_count(dentry->d_inode);
-               dir->i_size -= name_len * 2;
-               mark_inode_dirty(dir);
+               printk("close ctree returns %d\n", ret);
        }
-       return ret;
+       btrfs_sysfs_del_super(fs);
+       sb->s_fs_info = NULL;
 }
 
-static int btrfs_unlink(struct inode *dir, struct dentry *dentry)
-{
-       struct btrfs_root *root;
-       struct btrfs_trans_handle *trans;
-       int ret;
+enum {
+       Opt_degraded, Opt_subvol, Opt_device, Opt_nodatasum, Opt_nodatacow,
+       Opt_max_extent, Opt_max_inline, Opt_alloc_start, Opt_nobarrier,
+       Opt_ssd, Opt_thread_pool, Opt_noacl,  Opt_err,
+};
 
-       root = BTRFS_I(dir)->root;
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       ret = btrfs_unlink_trans(trans, root, dir, dentry);
-       btrfs_end_transaction(trans, root);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return ret;
-}
+static match_table_t tokens = {
+       {Opt_degraded, "degraded"},
+       {Opt_subvol, "subvol=%s"},
+       {Opt_device, "device=%s"},
+       {Opt_nodatasum, "nodatasum"},
+       {Opt_nodatacow, "nodatacow"},
+       {Opt_nobarrier, "nobarrier"},
+       {Opt_max_extent, "max_extent=%s"},
+       {Opt_max_inline, "max_inline=%s"},
+       {Opt_alloc_start, "alloc_start=%s"},
+       {Opt_thread_pool, "thread_pool=%d"},
+       {Opt_ssd, "ssd"},
+       {Opt_noacl, "noacl"},
+       {Opt_err, NULL},
+};
 
-static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
-{
-       struct inode *inode = dentry->d_inode;
-       int err;
-       int ret;
-       struct btrfs_root *root = BTRFS_I(dir)->root;
-       struct btrfs_path *path;
-       struct btrfs_key key;
-       struct btrfs_trans_handle *trans;
-       struct btrfs_key found_key;
-       int found_type;
-       struct btrfs_leaf *leaf;
-       char *goodnames = "..";
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       key.objectid = inode->i_ino;
-       key.offset = (u64)-1;
-       key.flags = (u32)-1;
-       while(1) {
-               ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-               if (ret < 0) {
-                       err = ret;
-                       goto out;
-               }
-               BUG_ON(ret == 0);
-               if (path->slots[0] == 0) {
-                       err = -ENOENT;
-                       goto out;
-               }
-               path->slots[0]--;
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               btrfs_disk_key_to_cpu(&found_key,
-                                     &leaf->items[path->slots[0]].key);
-               found_type = btrfs_key_type(&found_key);
-               if (found_key.objectid != inode->i_ino) {
-                       err = -ENOENT;
-                       goto out;
+u64 btrfs_parse_size(char *str)
+{
+       u64 res;
+       int mult = 1;
+       char *end;
+       char last;
+
+       res = simple_strtoul(str, &end, 10);
+
+       last = end[0];
+       if (isalpha(last)) {
+               last = tolower(last);
+               switch (last) {
+               case 'g':
+                       mult *= 1024;
+               case 'm':
+                       mult *= 1024;
+               case 'k':
+                       mult *= 1024;
                }
-               if ((found_type != BTRFS_DIR_ITEM_KEY &&
-                    found_type != BTRFS_DIR_INDEX_KEY) ||
-                   (!btrfs_match_dir_item_name(root, path, goodnames, 2) &&
-                   !btrfs_match_dir_item_name(root, path, goodnames, 1))) {
-                       err = -ENOTEMPTY;
-                       goto out;
-               }
-               ret = btrfs_del_item(trans, root, path);
-               BUG_ON(ret);
-
-               if (found_type == BTRFS_DIR_ITEM_KEY && found_key.offset == 1)
-                       break;
-               btrfs_release_path(root, path);
-       }
-       ret = 0;
-       btrfs_release_path(root, path);
-
-       /* now the directory is empty */
-       err = btrfs_unlink_trans(trans, root, dir, dentry);
-       if (!err) {
-               inode->i_size = 0;
+               res = res * mult;
        }
-out:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       ret = btrfs_end_transaction(trans, root);
-       if (ret && !err)
-               err = ret;
-       return err;
+       return res;
 }
 
-static int btrfs_free_inode(struct btrfs_trans_handle *trans,
-                           struct btrfs_root *root,
-                           struct inode *inode)
+/*
+ * Regular mount options parser.  Everything that is needed only when
+ * reading in a new superblock is parsed here.
+ */
+int btrfs_parse_options(struct btrfs_root *root, char *options)
 {
-       struct btrfs_path *path;
-       int ret;
+       struct btrfs_fs_info *info = root->fs_info;
+       substring_t args[MAX_OPT_ARGS];
+       char *p, *num;
+       int intarg;
 
-       clear_inode(inode);
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       ret = btrfs_lookup_inode(trans, root, path,
-                                &BTRFS_I(inode)->location, -1);
-       BUG_ON(ret);
-       ret = btrfs_del_item(trans, root, path);
-       BUG_ON(ret);
-       btrfs_free_path(path);
-       return ret;
-}
+       if (!options)
+               return 0;
 
-static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
-                                  struct btrfs_root *root,
-                                  struct inode *inode)
-{
-       int ret;
-       struct btrfs_path *path;
-       struct btrfs_key key;
-       struct btrfs_disk_key *found_key;
-       struct btrfs_leaf *leaf;
-       struct btrfs_file_extent_item *fi = NULL;
-       u64 extent_start = 0;
-       u64 extent_num_blocks = 0;
-       int found_extent;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       /* FIXME, add redo link to tree so we don't leak on crash */
-       key.objectid = inode->i_ino;
-       key.offset = (u64)-1;
-       key.flags = 0;
        /*
-        * use BTRFS_CSUM_ITEM_KEY because it is larger than inline keys
-        * or extent data
+        * strsep changes the string, duplicate it because parse_options
+        * gets called twice
         */
-       btrfs_set_key_type(&key, BTRFS_CSUM_ITEM_KEY);
-       while(1) {
-               btrfs_init_path(path);
-               ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-               if (ret < 0) {
-                       goto error;
-               }
-               if (ret > 0) {
-                       BUG_ON(path->slots[0] == 0);
-                       path->slots[0]--;
-               }
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               found_key = &leaf->items[path->slots[0]].key;
-               if (btrfs_disk_key_objectid(found_key) != inode->i_ino)
+       options = kstrdup(options, GFP_NOFS);
+       if (!options)
+               return -ENOMEM;
+
+
+       while ((p = strsep(&options, ",")) != NULL) {
+               int token;
+               if (!*p)
+                       continue;
+
+               token = match_token(p, tokens, args);
+               switch (token) {
+               case Opt_degraded:
+                       printk(KERN_INFO "btrfs: allowing degraded mounts\n");
+                       btrfs_set_opt(info->mount_opt, DEGRADED);
                        break;
-               if (btrfs_disk_key_type(found_key) != BTRFS_CSUM_ITEM_KEY &&
-                   btrfs_disk_key_type(found_key) != BTRFS_INLINE_DATA_KEY &&
-                   btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY)
+               case Opt_subvol:
+               case Opt_device:
+                       /*
+                        * These are parsed by btrfs_parse_early_options
+                        * and can be happily ignored here.
+                        */
                        break;
-               if (btrfs_disk_key_offset(found_key) < inode->i_size)
+               case Opt_nodatasum:
+                       printk(KERN_INFO "btrfs: setting nodatacsum\n");
+                       btrfs_set_opt(info->mount_opt, NODATASUM);
+                       break;
+               case Opt_nodatacow:
+                       printk(KERN_INFO "btrfs: setting nodatacow\n");
+                       btrfs_set_opt(info->mount_opt, NODATACOW);
+                       btrfs_set_opt(info->mount_opt, NODATASUM);
+                       break;
+               case Opt_ssd:
+                       printk(KERN_INFO "btrfs: use ssd allocation scheme\n");
+                       btrfs_set_opt(info->mount_opt, SSD);
+                       break;
+               case Opt_nobarrier:
+                       printk(KERN_INFO "btrfs: turning off barriers\n");
+                       btrfs_set_opt(info->mount_opt, NOBARRIER);
+                       break;
+               case Opt_thread_pool:
+                       intarg = 0;
+                       match_int(&args[0], &intarg);
+                       if (intarg) {
+                               info->thread_pool_size = intarg;
+                               printk(KERN_INFO "btrfs: thread pool %d\n",
+                                      info->thread_pool_size);
+                       }
+                       break;
+               case Opt_max_extent:
+                       num = match_strdup(&args[0]);
+                       if (num) {
+                               info->max_extent = btrfs_parse_size(num);
+                               kfree(num);
+
+                               info->max_extent = max_t(u64,
+                                       info->max_extent, root->sectorsize);
+                               printk(KERN_INFO "btrfs: max_extent at %llu\n",
+                                      info->max_extent);
+                       }
+                       break;
+               case Opt_max_inline:
+                       num = match_strdup(&args[0]);
+                       if (num) {
+                               info->max_inline = btrfs_parse_size(num);
+                               kfree(num);
+
+                               if (info->max_inline) {
+                                       info->max_inline = max_t(u64,
+                                               info->max_inline,
+                                               root->sectorsize);
+                               }
+                               printk(KERN_INFO "btrfs: max_inline at %llu\n",
+                                       info->max_inline);
+                       }
+                       break;
+               case Opt_alloc_start:
+                       num = match_strdup(&args[0]);
+                       if (num) {
+                               info->alloc_start = btrfs_parse_size(num);
+                               kfree(num);
+                               printk(KERN_INFO
+                                       "btrfs: allocations start at %llu\n",
+                                       info->alloc_start);
+                       }
+                       break;
+               case Opt_noacl:
+                       root->fs_info->sb->s_flags &= ~MS_POSIXACL;
+                       break;
+               default:
                        break;
-               if (btrfs_disk_key_type(found_key) == BTRFS_EXTENT_DATA_KEY) {
-                       fi = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                                           path->slots[0],
-                                           struct btrfs_file_extent_item);
-                       extent_start = btrfs_file_extent_disk_blocknr(fi);
-                       extent_num_blocks =
-                               btrfs_file_extent_disk_num_blocks(fi);
-                       inode->i_blocks -=
-                               btrfs_file_extent_num_blocks(fi) >> 9;
-                       found_extent = 1;
-               } else {
-                       found_extent = 0;
-               }
-               ret = btrfs_del_item(trans, root, path);
-               BUG_ON(ret);
-               btrfs_release_path(root, path);
-               if (found_extent) {
-                       ret = btrfs_free_extent(trans, root, extent_start,
-                                               extent_num_blocks, 0);
-                       BUG_ON(ret);
                }
        }
-       ret = 0;
-error:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       return ret;
-}
-
-static void btrfs_delete_inode(struct inode *inode)
-{
-       struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       int ret;
-
-       truncate_inode_pages(&inode->i_data, 0);
-       if (is_bad_inode(inode)) {
-               goto no_delete;
-       }
-       inode->i_size = 0;
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       if (S_ISREG(inode->i_mode)) {
-               ret = btrfs_truncate_in_trans(trans, root, inode);
-               BUG_ON(ret);
-       }
-       btrfs_free_inode(trans, root, inode);
-       btrfs_end_transaction(trans, root);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return;
-no_delete:
-       clear_inode(inode);
-}
-
-static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
-                              struct btrfs_key *location)
-{
-       const char *name = dentry->d_name.name;
-       int namelen = dentry->d_name.len;
-       struct btrfs_dir_item *di;
-       struct btrfs_path *path;
-       struct btrfs_root *root = BTRFS_I(dir)->root;
-       int ret;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       ret = btrfs_lookup_dir_item(NULL, root, path, dir->i_ino, name,
-                                   namelen, 0);
-       if (ret || !btrfs_match_dir_item_name(root, path, name, namelen)) {
-               location->objectid = 0;
-               ret = 0;
-               goto out;
-       }
-       di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
-                           struct btrfs_dir_item);
-       btrfs_disk_key_to_cpu(location, &di->location);
-out:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       return ret;
-}
-
-int fixup_tree_root_location(struct btrfs_root *root,
-                            struct btrfs_key *location,
-                            struct btrfs_root **sub_root)
-{
-       struct btrfs_path *path;
-       struct btrfs_root_item *ri;
-
-       if (btrfs_key_type(location) != BTRFS_ROOT_ITEM_KEY)
-               return 0;
-       if (location->objectid == BTRFS_ROOT_TREE_OBJECTID)
-               return 0;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       mutex_lock(&root->fs_info->fs_mutex);
-
-       *sub_root = btrfs_read_fs_root(root->fs_info, location);
-       if (IS_ERR(*sub_root))
-               return PTR_ERR(*sub_root);
-
-       ri = &(*sub_root)->root_item;
-       location->objectid = btrfs_root_dirid(ri);
-       location->flags = 0;
-       btrfs_set_key_type(location, BTRFS_INODE_ITEM_KEY);
-       location->offset = 0;
-
-       btrfs_free_path(path);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return 0;
-}
-
-int btrfs_init_locked_inode(struct inode *inode, void *p)
-{
-       struct btrfs_iget_args *args = p;
-       inode->i_ino = args->ino;
-       BTRFS_I(inode)->root = args->root;
+       kfree(options);
        return 0;
 }
 
-int btrfs_find_actor(struct inode *inode, void *opaque)
+/*
+ * Parse mount options that are required early in the mount process.
+ *
+ * All other options will be parsed on much later in the mount process and
+ * only when we need to allocate a new super block.
+ */
+static int btrfs_parse_early_options(const char *options, int flags,
+               void *holder, char **subvol_name,
+               struct btrfs_fs_devices **fs_devices)
 {
-       struct btrfs_iget_args *args = opaque;
-       return (args->ino == inode->i_ino &&
-               args->root == BTRFS_I(inode)->root);
-}
+       substring_t args[MAX_OPT_ARGS];
+       char *opts, *p;
+       int error = 0;
 
-struct inode *btrfs_iget_locked(struct super_block *s, u64 objectid,
-                               struct btrfs_root *root)
-{
-       struct inode *inode;
-       struct btrfs_iget_args args;
-       args.ino = objectid;
-       args.root = root;
-
-       inode = iget5_locked(s, objectid, btrfs_find_actor,
-                            btrfs_init_locked_inode,
-                            (void *)&args);
-       return inode;
-}
+       if (!options)
+               goto out;
 
-static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *nd)
-{
-       struct inode * inode;
-       struct btrfs_inode *bi = BTRFS_I(dir);
-       struct btrfs_root *root = bi->root;
-       struct btrfs_root *sub_root = root;
-       struct btrfs_key location;
-       int ret;
+       /*
+        * strsep changes the string, duplicate it because parse_options
+        * gets called twice
+        */
+       opts = kstrdup(options, GFP_KERNEL);
+       if (!opts)
+               return -ENOMEM;
 
-       if (dentry->d_name.len > BTRFS_NAME_LEN)
-               return ERR_PTR(-ENAMETOOLONG);
-       mutex_lock(&root->fs_info->fs_mutex);
-       ret = btrfs_inode_by_name(dir, dentry, &location);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       if (ret < 0)
-               return ERR_PTR(ret);
-       inode = NULL;
-       if (location.objectid) {
-               ret = fixup_tree_root_location(root, &location, &sub_root);
-               if (ret < 0)
-                       return ERR_PTR(ret);
-               if (ret > 0)
-                       return ERR_PTR(-ENOENT);
-               inode = btrfs_iget_locked(dir->i_sb, location.objectid,
-                                         sub_root);
-               if (!inode)
-                       return ERR_PTR(-EACCES);
-               if (inode->i_state & I_NEW) {
-                       if (sub_root != root) {
-printk("adding new root for inode %lu root %p (found %p)\n", inode->i_ino, sub_root, BTRFS_I(inode)->root);
-                               igrab(inode);
-                               sub_root->inode = inode;
-                       }
-                       BTRFS_I(inode)->root = sub_root;
-                       memcpy(&BTRFS_I(inode)->location, &location,
-                              sizeof(location));
-                       btrfs_read_locked_inode(inode);
-                       unlock_new_inode(inode);
-               }
-       }
-       return d_splice_alias(inode, dentry);
-}
+       while ((p = strsep(&opts, ",")) != NULL) {
+               int token;
+               if (!*p)
+                       continue;
 
-static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
-{
-       struct inode *inode = filp->f_path.dentry->d_inode;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_item *item;
-       struct btrfs_dir_item *di;
-       struct btrfs_key key;
-       struct btrfs_path *path;
-       int ret;
-       u32 nritems;
-       struct btrfs_leaf *leaf;
-       int slot;
-       int advance;
-       unsigned char d_type = DT_UNKNOWN;
-       int over = 0;
-       int key_type = BTRFS_DIR_INDEX_KEY;
-
-       /* FIXME, use a real flag for deciding about the key type */
-       if (root->fs_info->tree_root == root)
-               key_type = BTRFS_DIR_ITEM_KEY;
-       mutex_lock(&root->fs_info->fs_mutex);
-       key.objectid = inode->i_ino;
-       key.flags = 0;
-       btrfs_set_key_type(&key, key_type);
-       key.offset = filp->f_pos;
-       path = btrfs_alloc_path();
-       btrfs_init_path(path);
-       ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-       if (ret < 0)
-               goto err;
-       advance = 0;
-       while(1) {
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               nritems = btrfs_header_nritems(&leaf->header);
-               slot = path->slots[0];
-               if (advance || slot >= nritems) {
-                       if (slot >= nritems -1) {
-                               ret = btrfs_next_leaf(root, path);
-                               if (ret)
-                                       break;
-                               leaf = btrfs_buffer_leaf(path->nodes[0]);
-                               nritems = btrfs_header_nritems(&leaf->header);
-                               slot = path->slots[0];
-                       } else {
-                               slot++;
-                               path->slots[0]++;
-                       }
-               }
-               advance = 1;
-               item = leaf->items + slot;
-               if (btrfs_disk_key_objectid(&item->key) != key.objectid)
+               token = match_token(p, tokens, args);
+               switch (token) {
+               case Opt_subvol:
+                       *subvol_name = match_strdup(&args[0]);
                        break;
-               if (key_type == BTRFS_DIR_INDEX_KEY &&
-                   btrfs_disk_key_offset(&item->key) > root->highest_inode)
+               case Opt_device:
+                       error = btrfs_scan_one_device(match_strdup(&args[0]),
+                                       flags, holder, fs_devices);
+                       if (error)
+                               goto out_free_opts;
                        break;
-               if (btrfs_disk_key_type(&item->key) != key_type)
-                       continue;
-               if (btrfs_disk_key_offset(&item->key) < filp->f_pos)
-                       continue;
-               filp->f_pos = btrfs_disk_key_offset(&item->key);
-               advance = 1;
-               di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);
-               over = filldir(dirent, (const char *)(di + 1),
-                              btrfs_dir_name_len(di),
-                              btrfs_disk_key_offset(&item->key),
-                              btrfs_disk_key_objectid(&di->location), d_type);
-               if (over)
-                       goto nopos;
+               default:
+                       break;
+               }
        }
-       filp->f_pos++;
-nopos:
-       ret = 0;
-err:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return ret;
-}
-
-static void btrfs_put_super (struct super_block * sb)
-{
-       struct btrfs_root *root = btrfs_sb(sb);
-       int ret;
 
-       ret = close_ctree(root);
-       if (ret) {
-               printk("close ctree returns %d\n", ret);
+ out_free_opts:
+       kfree(opts);
+ out:
+       /*
+        * If no subvolume name is specified we use the default one.  Allocate
+        * a copy of the string "default" here so that code later in the
+        * mount path doesn't care if it's the default volume or another one.
+        */
+       if (!*subvol_name) {
+               *subvol_name = kstrdup("default", GFP_KERNEL);
+               if (!*subvol_name)
+                       return -ENOMEM;
        }
-       sb->s_fs_info = NULL;
+       return error;
 }
 
-static int btrfs_fill_super(struct super_block * sb, void * data, int silent)
+static int btrfs_fill_super(struct super_block * sb,
+                           struct btrfs_fs_devices *fs_devices,
+                           void * data, int silent)
 {
        struct inode * inode;
        struct dentry * root_dentry;
        struct btrfs_super_block *disk_super;
        struct btrfs_root *tree_root;
        struct btrfs_inode *bi;
+       int err;
 
        sb->s_maxbytes = MAX_LFS_FILESIZE;
        sb->s_magic = BTRFS_SUPER_MAGIC;
        sb->s_op = &btrfs_super_ops;
+       sb->s_export_op = &btrfs_export_ops;
+       sb->s_xattr = btrfs_xattr_handlers;
        sb->s_time_gran = 1;
+       sb->s_flags |= MS_POSIXACL;
 
-       tree_root = open_ctree(sb);
+       tree_root = open_ctree(sb, fs_devices, (char *)data);
 
-       if (!tree_root) {
+       if (IS_ERR(tree_root)) {
                printk("btrfs: open_ctree failed\n");
-               return -EIO;
+               return PTR_ERR(tree_root);
        }
        sb->s_fs_info = tree_root;
-       disk_super = tree_root->fs_info->disk_super;
-       printk("read in super total blocks %Lu root %Lu\n",
-              btrfs_super_total_blocks(disk_super),
-              btrfs_super_root_dir(disk_super));
-
+       disk_super = &tree_root->fs_info->super_copy;
        inode = btrfs_iget_locked(sb, btrfs_super_root_dir(disk_super),
                                  tree_root);
        bi = BTRFS_I(inode);
        bi->location.objectid = inode->i_ino;
        bi->location.offset = 0;
-       bi->location.flags = 0;
        bi->root = tree_root;
+
        btrfs_set_key_type(&bi->location, BTRFS_INODE_ITEM_KEY);
 
-       if (!inode)
-               return -ENOMEM;
+       if (!inode) {
+               err = -ENOMEM;
+               goto fail_close;
+       }
        if (inode->i_state & I_NEW) {
                btrfs_read_locked_inode(inode);
                unlock_new_inode(inode);
@@ -644,1536 +338,323 @@ static int btrfs_fill_super(struct super_block * sb, void * data, int silent)
        root_dentry = d_alloc_root(inode);
        if (!root_dentry) {
                iput(inode);
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto fail_close;
        }
-       sb->s_root = root_dentry;
-
-       return 0;
-}
 
-static void fill_inode_item(struct btrfs_inode_item *item,
-                           struct inode *inode)
-{
-       btrfs_set_inode_uid(item, inode->i_uid);
-       btrfs_set_inode_gid(item, inode->i_gid);
-       btrfs_set_inode_size(item, inode->i_size);
-       btrfs_set_inode_mode(item, inode->i_mode);
-       btrfs_set_inode_nlink(item, inode->i_nlink);
-       btrfs_set_timespec_sec(&item->atime, inode->i_atime.tv_sec);
-       btrfs_set_timespec_nsec(&item->atime, inode->i_atime.tv_nsec);
-       btrfs_set_timespec_sec(&item->mtime, inode->i_mtime.tv_sec);
-       btrfs_set_timespec_nsec(&item->mtime, inode->i_mtime.tv_nsec);
-       btrfs_set_timespec_sec(&item->ctime, inode->i_ctime.tv_sec);
-       btrfs_set_timespec_nsec(&item->ctime, inode->i_ctime.tv_nsec);
-       btrfs_set_inode_nblocks(item, inode->i_blocks);
-       btrfs_set_inode_generation(item, inode->i_generation);
-}
+       /* this does the super kobj at the same time */
+       err = btrfs_sysfs_add_super(tree_root->fs_info);
+       if (err)
+               goto fail_close;
 
-static int btrfs_update_inode(struct btrfs_trans_handle *trans,
-                             struct btrfs_root *root,
-                             struct inode *inode)
-{
-       struct btrfs_inode_item *inode_item;
-       struct btrfs_path *path;
-       int ret;
+       sb->s_root = root_dentry;
 
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       ret = btrfs_lookup_inode(trans, root, path,
-                                &BTRFS_I(inode)->location, 1);
-       if (ret) {
-               if (ret > 0)
-                       ret = -ENOENT;
-               goto failed;
-       }
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
+       save_mount_options(sb, data);
+#endif
 
-       inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                                 path->slots[0],
-                                 struct btrfs_inode_item);
+       return 0;
 
-       fill_inode_item(inode_item, inode);
-       btrfs_mark_buffer_dirty(path->nodes[0]);
-       ret = 0;
-failed:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       return ret;
+fail_close:
+       close_ctree(tree_root);
+       return err;
 }
 
-static int btrfs_write_inode(struct inode *inode, int wait)
+int btrfs_sync_fs(struct super_block *sb, int wait)
 {
-       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
+       struct btrfs_root *root;
        int ret;
+       root = btrfs_sb(sb);
 
-       mutex_lock(&root->fs_info->fs_mutex);
+       sb->s_dirt = 0;
+       if (!wait) {
+               filemap_flush(root->fs_info->btree_inode->i_mapping);
+               return 0;
+       }
+       btrfs_clean_old_snapshots(root);
        trans = btrfs_start_transaction(root, 1);
-       ret = btrfs_update_inode(trans, root, inode);
-       if (wait)
-               btrfs_commit_transaction(trans, root);
-       else
-               btrfs_end_transaction(trans, root);
-       mutex_unlock(&root->fs_info->fs_mutex);
+       ret = btrfs_commit_transaction(trans, root);
+       sb->s_dirt = 0;
        return ret;
 }
 
-static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
-                                    struct btrfs_root *root,
-                                    u64 objectid, int mode)
+static void btrfs_write_super(struct super_block *sb)
 {
-       struct inode *inode;
-       struct btrfs_inode_item inode_item;
-       struct btrfs_key *location;
-       int ret;
-
-       inode = new_inode(root->fs_info->sb);
-       if (!inode)
-               return ERR_PTR(-ENOMEM);
-
-       BTRFS_I(inode)->root = root;
-
-       inode->i_uid = current->fsuid;
-       inode->i_gid = current->fsgid;
-       inode->i_mode = mode;
-       inode->i_ino = objectid;
-       inode->i_blocks = 0;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-       fill_inode_item(&inode_item, inode);
-       location = &BTRFS_I(inode)->location;
-       location->objectid = objectid;
-       location->flags = 0;
-       location->offset = 0;
-       btrfs_set_key_type(location, BTRFS_INODE_ITEM_KEY);
-
-       ret = btrfs_insert_inode(trans, root, objectid, &inode_item);
-       BUG_ON(ret);
-
-       insert_inode_hash(inode);
-       return inode;
+       sb->s_dirt = 0;
 }
 
-static int btrfs_add_link(struct btrfs_trans_handle *trans,
-                           struct dentry *dentry, struct inode *inode)
+static int btrfs_test_super(struct super_block *s, void *data)
 {
-       int ret;
-       struct btrfs_key key;
-       struct btrfs_root *root = BTRFS_I(dentry->d_parent->d_inode)->root;
-       key.objectid = inode->i_ino;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
-       key.offset = 0;
-
-       ret = btrfs_insert_dir_item(trans, root,
-                                   dentry->d_name.name, dentry->d_name.len,
-                                   dentry->d_parent->d_inode->i_ino,
-                                   &key, 0);
-       if (ret == 0) {
-               dentry->d_parent->d_inode->i_size += dentry->d_name.len * 2;
-               ret = btrfs_update_inode(trans, root,
-                                        dentry->d_parent->d_inode);
-       }
-       return ret;
-}
+       struct btrfs_fs_devices *test_fs_devices = data;
+       struct btrfs_root *root = btrfs_sb(s);
 
-static int btrfs_add_nondir(struct btrfs_trans_handle *trans,
-                           struct dentry *dentry, struct inode *inode)
-{
-       int err = btrfs_add_link(trans, dentry, inode);
-       if (!err) {
-               d_instantiate(dentry, inode);
-               return 0;
-       }
-       if (err > 0)
-               err = -EEXIST;
-       return err;
+       return root->fs_info->fs_devices == test_fs_devices;
 }
 
-static int btrfs_create(struct inode *dir, struct dentry *dentry,
-                       int mode, struct nameidata *nd)
-{
-       struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = BTRFS_I(dir)->root;
-       struct inode *inode;
-       int err;
-       int drop_inode = 0;
-       u64 objectid;
+/*
+ * Find a superblock for the given device / mount point.
+ *
+ * Note:  This is based on get_sb_bdev from fs/super.c with a few additions
+ *       for multiple device setup.  Make sure to keep it in sync.
+ */
+static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
+               const char *dev_name, void *data, struct vfsmount *mnt)
+{
+       char *subvol_name = NULL;
+       struct block_device *bdev = NULL;
+       struct super_block *s;
+       struct dentry *root;
+       struct btrfs_fs_devices *fs_devices = NULL;
+       int error = 0;
+
+       error = btrfs_parse_early_options(data, flags, fs_type,
+                                         &subvol_name, &fs_devices);
+       if (error)
+               goto error;
 
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
+       error = btrfs_scan_one_device(dev_name, flags, fs_type, &fs_devices);
+       if (error)
+               goto error_free_subvol_name;
+
+       error = btrfs_open_devices(fs_devices, flags, fs_type);
+       if (error)
+               goto error_free_subvol_name;
+
+       bdev = fs_devices->latest_bdev;
+       s = sget(fs_type, btrfs_test_super, set_anon_super, fs_devices);
+       if (IS_ERR(s))
+               goto error_s;
+
+       if (s->s_root) {
+               if ((flags ^ s->s_flags) & MS_RDONLY) {
+                       up_write(&s->s_umount);
+                       deactivate_super(s);
+                       error = -EBUSY;
+                       goto error_bdev;
+               }
 
-       err = btrfs_find_free_objectid(trans, root, dir->i_ino, &objectid);
-       if (err) {
-               err = -ENOSPC;
-               goto out_unlock;
-       }
+       } else {
+               char b[BDEVNAME_SIZE];
+
+               s->s_flags = flags;
+               strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
+               error = btrfs_fill_super(s, fs_devices, data,
+                                        flags & MS_SILENT ? 1 : 0);
+               if (error) {
+                       up_write(&s->s_umount);
+                       deactivate_super(s);
+                       goto error;
+               }
 
-       inode = btrfs_new_inode(trans, root, objectid, mode);
-       err = PTR_ERR(inode);
-       if (IS_ERR(inode))
-               goto out_unlock;
-       // FIXME mark the inode dirty
-       err = btrfs_add_nondir(trans, dentry, inode);
-       if (err)
-               drop_inode = 1;
-       else {
-               inode->i_mapping->a_ops = &btrfs_aops;
-               inode->i_fop = &btrfs_file_operations;
-               inode->i_op = &btrfs_file_inode_operations;
+               btrfs_sb(s)->fs_info->bdev_holder = fs_type;
+               s->s_flags |= MS_ACTIVE;
        }
-       dir->i_sb->s_dirt = 1;
-out_unlock:
-       btrfs_end_transaction(trans, root);
-       mutex_unlock(&root->fs_info->fs_mutex);
 
-       if (drop_inode) {
-               inode_dec_link_count(inode);
-               iput(inode);
+       if (!strcmp(subvol_name, "."))
+               root = dget(s->s_root);
+       else {
+               mutex_lock(&s->s_root->d_inode->i_mutex);
+               root = lookup_one_len(subvol_name, s->s_root, strlen(subvol_name));
+               mutex_unlock(&s->s_root->d_inode->i_mutex);
+               if (IS_ERR(root)) {
+                       up_write(&s->s_umount);
+                       deactivate_super(s);
+                       error = PTR_ERR(root);
+                       goto error;
+               }
+               if (!root->d_inode) {
+                       dput(root);
+                       up_write(&s->s_umount);
+                       deactivate_super(s);
+                       error = -ENXIO;
+                       goto error;
+               }
        }
-       return err;
-}
-
-static int btrfs_make_empty_dir(struct btrfs_trans_handle *trans,
-                               struct btrfs_root *root,
-                               u64 objectid, u64 dirid)
-{
-       int ret;
-       char buf[2];
-       struct btrfs_key key;
 
-       buf[0] = '.';
-       buf[1] = '.';
+       mnt->mnt_sb = s;
+       mnt->mnt_root = root;
 
-       key.objectid = objectid;
-       key.offset = 0;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
+       kfree(subvol_name);
+       return 0;
 
-       ret = btrfs_insert_dir_item(trans, root, buf, 1, objectid,
-                                   &key, 1);
-       if (ret)
-               goto error;
-       key.objectid = dirid;
-       ret = btrfs_insert_dir_item(trans, root, buf, 2, objectid,
-                                   &key, 1);
-       if (ret)
-               goto error;
+error_s:
+       error = PTR_ERR(s);
+error_bdev:
+       btrfs_close_devices(fs_devices);
+error_free_subvol_name:
+       kfree(subvol_name);
 error:
-       return ret;
+       return error;
+}
+
+static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
+{
+       struct btrfs_root *root = btrfs_sb(dentry->d_sb);
+       struct btrfs_super_block *disk_super = &root->fs_info->super_copy;
+       int bits = dentry->d_sb->s_blocksize_bits;
+       __be32 *fsid = (__be32 *)root->fs_info->fsid;
+
+       buf->f_namelen = BTRFS_NAME_LEN;
+       buf->f_blocks = btrfs_super_total_bytes(disk_super) >> bits;
+       buf->f_bfree = buf->f_blocks -
+               (btrfs_super_bytes_used(disk_super) >> bits);
+       buf->f_bavail = buf->f_bfree;
+       buf->f_bsize = dentry->d_sb->s_blocksize;
+       buf->f_type = BTRFS_SUPER_MAGIC;
+       /* We treat it as constant endianness (it doesn't matter _which_)
+          because we want the fsid to come out the same whether mounted 
+          on a big-endian or little-endian host */
+       buf->f_fsid.val[0] = be32_to_cpu(fsid[0]) ^ be32_to_cpu(fsid[2]);
+       buf->f_fsid.val[1] = be32_to_cpu(fsid[1]) ^ be32_to_cpu(fsid[3]);
+       /* Mask in the root object ID too, to disambiguate subvols */
+       buf->f_fsid.val[0] ^= BTRFS_I(dentry->d_inode)->root->objectid >> 32;
+       buf->f_fsid.val[1] ^= BTRFS_I(dentry->d_inode)->root->objectid;
+
+       return 0;
 }
 
-static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+static struct file_system_type btrfs_fs_type = {
+       .owner          = THIS_MODULE,
+       .name           = "btrfs",
+       .get_sb         = btrfs_get_sb,
+       .kill_sb        = kill_anon_super,
+       .fs_flags       = FS_REQUIRES_DEV,
+};
+
+static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
+                               unsigned long arg)
 {
-       struct inode *inode;
-       struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = BTRFS_I(dir)->root;
-       int err = 0;
-       int drop_on_err = 0;
-       u64 objectid;
+       struct btrfs_ioctl_vol_args *vol;
+       struct btrfs_fs_devices *fs_devices;
+       int ret = 0;
+       int len;
 
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       if (IS_ERR(trans)) {
-               err = PTR_ERR(trans);
-               goto out_unlock;
+       vol = kmalloc(sizeof(*vol), GFP_KERNEL);
+       if (copy_from_user(vol, (void __user *)arg, sizeof(*vol))) {
+               ret = -EFAULT;
+               goto out;
        }
-
-       err = btrfs_find_free_objectid(trans, root, dir->i_ino, &objectid);
-       if (err) {
-               err = -ENOSPC;
-               goto out_unlock;
+       len = strnlen(vol->name, BTRFS_PATH_NAME_MAX);
+       switch (cmd) {
+       case BTRFS_IOC_SCAN_DEV:
+               ret = btrfs_scan_one_device(vol->name, MS_RDONLY,
+                                           &btrfs_fs_type, &fs_devices);
+               break;
        }
+out:
+       kfree(vol);
+       return ret;
+}
 
-       inode = btrfs_new_inode(trans, root, objectid, S_IFDIR | mode);
-       if (IS_ERR(inode)) {
-               err = PTR_ERR(inode);
-               goto out_fail;
-       }
-       drop_on_err = 1;
-       inode->i_op = &btrfs_dir_inode_operations;
-       inode->i_fop = &btrfs_dir_file_operations;
+static void btrfs_write_super_lockfs(struct super_block *sb)
+{
+       struct btrfs_root *root = btrfs_sb(sb);
+       mutex_lock(&root->fs_info->transaction_kthread_mutex);
+       mutex_lock(&root->fs_info->cleaner_mutex);
+}
 
-       err = btrfs_make_empty_dir(trans, root, inode->i_ino, dir->i_ino);
-       if (err)
-               goto out_fail;
-
-       inode->i_size = 6;
-       err = btrfs_update_inode(trans, root, inode);
-       if (err)
-               goto out_fail;
-       err = btrfs_add_link(trans, dentry, inode);
-       if (err)
-               goto out_fail;
-       d_instantiate(dentry, inode);
-       drop_on_err = 0;
-
-out_fail:
-       btrfs_end_transaction(trans, root);
-out_unlock:
-       mutex_unlock(&root->fs_info->fs_mutex);
-       if (drop_on_err)
-               iput(inode);
-       return err;
-}
-
-static int btrfs_sync_fs(struct super_block *sb, int wait)
-{
-       struct btrfs_trans_handle *trans;
-       struct btrfs_root *root;
-       int ret;
-       root = btrfs_sb(sb);
-
-       sb->s_dirt = 0;
-       if (!wait) {
-               filemap_flush(root->fs_info->btree_inode->i_mapping);
-               return 0;
-       }
-       filemap_write_and_wait(root->fs_info->btree_inode->i_mapping);
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       ret = btrfs_commit_transaction(trans, root);
-       sb->s_dirt = 0;
-       BUG_ON(ret);
-printk("btrfs sync_fs\n");
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return 0;
-}
-
-#if 0
-static int btrfs_get_block_inline(struct inode *inode, sector_t iblock,
-                          struct buffer_head *result, int create)
-{
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
-       struct btrfs_path *path;
-       struct btrfs_key key;
-       struct btrfs_leaf *leaf;
-       int num_bytes = result->b_size;
-       int item_size;
-       int ret;
-       u64 pos;
-       char *ptr;
-       int copy_size;
-       int err = 0;
-       char *safe_ptr;
-       char *data_ptr;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-
-       WARN_ON(create);
-       if (create) {
-               return 0;
-       }
-       pos = iblock << inode->i_blkbits;
-       key.objectid = inode->i_ino;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_INLINE_DATA_KEY);
-       ptr = kmap(result->b_page);
-       safe_ptr = ptr;
-       ptr += (pos & (PAGE_CACHE_SIZE -1));
-again:
-       key.offset = pos;
-       ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-       if (ret) {
-               if (ret < 0)
-                       err = ret;
-               else
-                       err = 0;
-               goto out;
-       }
-       leaf = btrfs_buffer_leaf(path->nodes[0]);
-       item_size = btrfs_item_size(leaf->items + path->slots[0]);
-       copy_size = min(num_bytes, item_size);
-       data_ptr = btrfs_item_ptr(leaf, path->slots[0], char);
-       WARN_ON(safe_ptr + PAGE_CACHE_SIZE < ptr + copy_size);
-       memcpy(ptr, data_ptr, copy_size);
-       pos += copy_size;
-       num_bytes -= copy_size;
-       WARN_ON(num_bytes < 0);
-       ptr += copy_size;
-       btrfs_release_path(root, path);
-       if (num_bytes != 0) {
-               if (pos >= i_size_read(inode))
-                       memset(ptr, 0, num_bytes);
-               else
-                       goto again;
-       }
-       set_buffer_uptodate(result);
-       map_bh(result, inode->i_sb, 0);
-       err = 0;
-out:
-       btrfs_free_path(path);
-       kunmap(result->b_page);
-       return err;
-}
-#endif
-
-static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
-                          struct buffer_head *result, int create)
-{
-       int ret;
-       int err = 0;
-       u64 blocknr;
-       u64 extent_start = 0;
-       u64 extent_end = 0;
-       u64 objectid = inode->i_ino;
-       struct btrfs_path *path;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_trans_handle *trans = NULL;
-       struct btrfs_file_extent_item *item;
-       struct btrfs_leaf *leaf;
-       struct btrfs_disk_key *found_key;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       btrfs_init_path(path);
-       if (create) {
-               trans = btrfs_start_transaction(root, 1);
-               WARN_ON(1);
-       }
-
-       ret = btrfs_lookup_file_extent(trans, root, path,
-                                      inode->i_ino,
-                                      iblock << inode->i_blkbits, create);
-       if (ret < 0) {
-               err = ret;
-               goto out;
-       }
-
-       if (ret != 0) {
-               if (path->slots[0] == 0) {
-                       btrfs_release_path(root, path);
-                       goto allocate;
-               }
-               path->slots[0]--;
-       }
-
-       item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
-                             struct btrfs_file_extent_item);
-       leaf = btrfs_buffer_leaf(path->nodes[0]);
-       blocknr = btrfs_file_extent_disk_blocknr(item);
-       blocknr += btrfs_file_extent_offset(item);
-
-       /* exact match found, use it, FIXME, deal with extents
-        * other than the page size
-        */
-       if (0 && ret == 0) {
-               err = 0;
-               if (create &&
-                   btrfs_file_extent_generation(item) != trans->transid) {
-                       struct btrfs_key ins;
-                       ret = btrfs_alloc_extent(trans, root, 1,
-                                                blocknr, (u64)-1, &ins);
-                       BUG_ON(ret);
-                       btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
-                       mark_buffer_dirty(path->nodes[0]);
-                       ret = btrfs_free_extent(trans, root,
-                                               blocknr, 1, 0);
-                       BUG_ON(ret);
-                       blocknr = ins.objectid;
-
-               }
-               btrfs_map_bh_to_logical(root, result, blocknr);
-               goto out;
-       }
-
-       /* are we inside the extent that was found? */
-       found_key = &leaf->items[path->slots[0]].key;
-       if (btrfs_disk_key_objectid(found_key) != objectid ||
-           btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY) {
-               extent_end = 0;
-               extent_start = 0;
-               btrfs_release_path(root, path);
-               goto allocate;
-       }
-
-       extent_start = btrfs_disk_key_offset(&leaf->items[path->slots[0]].key);
-       extent_start = extent_start >> inode->i_blkbits;
-       extent_start += btrfs_file_extent_offset(item);
-       extent_end = extent_start + btrfs_file_extent_num_blocks(item);
-       if (iblock >= extent_start && iblock < extent_end) {
-               err = 0;
-               btrfs_map_bh_to_logical(root, result, blocknr + iblock -
-                                       extent_start);
-               goto out;
-       }
-allocate:
-       /* ok, create a new extent */
-       if (!create) {
-               err = 0;
-               goto out;
-       }
-       ret = btrfs_alloc_file_extent(trans, root, objectid,
-                                     iblock << inode->i_blkbits,
-                                     1, extent_end, &blocknr);
-       if (ret) {
-               err = ret;
-               goto out;
-       }
-       inode->i_blocks += inode->i_sb->s_blocksize >> 9;
-       set_buffer_new(result);
-       map_bh(result, inode->i_sb, blocknr);
-
-       btrfs_map_bh_to_logical(root, result, blocknr);
-out:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       if (trans)
-               btrfs_end_transaction(trans, root);
-       return err;
-}
-
-static int btrfs_get_block(struct inode *inode, sector_t iblock,
-                          struct buffer_head *result, int create)
-{
-       int err;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       mutex_lock(&root->fs_info->fs_mutex);
-       err = btrfs_get_block_lock(inode, iblock, result, create);
-       // err = btrfs_get_block_inline(inode, iblock, result, create);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return err;
-}
-
-static int btrfs_prepare_write(struct file *file, struct page *page,
-                              unsigned from, unsigned to)
-{
-       return nobh_prepare_write(page, from, to, btrfs_get_block);
-}
-static int btrfs_commit_write(struct file *file, struct page *page,
-                              unsigned from, unsigned to)
-{
-       return nobh_commit_write(file, page, from, to);
-}
-
-static void btrfs_write_super(struct super_block *sb)
-{
-       btrfs_sync_fs(sb, 1);
-}
-
-static int btrfs_readpage(struct file *file, struct page *page)
-{
-       return mpage_readpage(page, btrfs_get_block);
-}
-
-static int btrfs_writepage(struct page *page, struct writeback_control *wbc)
-{
-       return nobh_writepage(page, btrfs_get_block, wbc);
-}
-
-static void btrfs_truncate(struct inode *inode)
-{
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       int ret;
-       struct btrfs_trans_handle *trans;
-
-       if (!S_ISREG(inode->i_mode))
-               return;
-       if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
-               return;
-
-       nobh_truncate_page(inode->i_mapping, inode->i_size);
-
-       /* FIXME, add redo link to tree so we don't leak on crash */
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       ret = btrfs_truncate_in_trans(trans, root, inode);
-       BUG_ON(ret);
-       ret = btrfs_end_transaction(trans, root);
-       BUG_ON(ret);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       mark_inode_dirty(inode);
-}
-
-static int btrfs_copy_from_user(loff_t pos, int num_pages, int write_bytes,
-                               struct page **prepared_pages,
-                               const char __user * buf)
-{
-       long page_fault = 0;
-       int i;
-       int offset = pos & (PAGE_CACHE_SIZE - 1);
-
-       for (i = 0; i < num_pages && write_bytes > 0; i++, offset = 0) {
-               size_t count = min_t(size_t,
-                                    PAGE_CACHE_SIZE - offset, write_bytes);
-               struct page *page = prepared_pages[i];
-               fault_in_pages_readable(buf, count);
-
-               /* Copy data from userspace to the current page */
-               kmap(page);
-               page_fault = __copy_from_user(page_address(page) + offset,
-                                             buf, count);
-               /* Flush processor's dcache for this page */
-               flush_dcache_page(page);
-               kunmap(page);
-               buf += count;
-               write_bytes -= count;
-
-               if (page_fault)
-                       break;
-       }
-       return page_fault ? -EFAULT : 0;
-}
-
-static void btrfs_drop_pages(struct page **pages, size_t num_pages)
-{
-       size_t i;
-       for (i = 0; i < num_pages; i++) {
-               if (!pages[i])
-                       break;
-               unlock_page(pages[i]);
-               mark_page_accessed(pages[i]);
-               page_cache_release(pages[i]);
-       }
-}
-static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
-                                  struct btrfs_root *root,
-                                  struct file *file,
-                                  struct page **pages,
-                                  size_t num_pages,
-                                  u64 extent_offset,
-                                  loff_t pos,
-                                  size_t write_bytes)
-{
-       int i;
-       int offset;
-       int err = 0;
-       int ret;
-       int this_write;
-       struct inode *inode = file->f_path.dentry->d_inode;
-
-       for (i = 0; i < num_pages; i++) {
-               offset = pos & (PAGE_CACHE_SIZE -1);
-               this_write = min(PAGE_CACHE_SIZE - offset, write_bytes);
-               /* FIXME, one block at a time */
-
-               mutex_lock(&root->fs_info->fs_mutex);
-               trans = btrfs_start_transaction(root, 1);
-               btrfs_csum_file_block(trans, root, inode->i_ino,
-                                     pages[i]->index << PAGE_CACHE_SHIFT,
-                                     extent_offset,
-                                     kmap(pages[i]), PAGE_CACHE_SIZE);
-               kunmap(pages[i]);
-               SetPageChecked(pages[i]);
-               ret = btrfs_end_transaction(trans, root);
-               BUG_ON(ret);
-               mutex_unlock(&root->fs_info->fs_mutex);
-
-               ret = nobh_commit_write(file, pages[i], offset,
-                                        offset + this_write);
-               pos += this_write;
-               if (ret) {
-                       err = ret;
-                       goto failed;
-               }
-               WARN_ON(this_write > write_bytes);
-               write_bytes -= this_write;
-       }
-failed:
-       return err;
-}
-
-static int prepare_pages(struct btrfs_trans_handle *trans,
-                        struct btrfs_root *root,
-                        struct file *file,
-                        struct page **pages,
-                        size_t num_pages,
-                        loff_t pos,
-                        unsigned long first_index,
-                        unsigned long last_index,
-                        size_t write_bytes,
-                        u64 alloc_extent_start)
-{
-       int i;
-       unsigned long index = pos >> PAGE_CACHE_SHIFT;
-       struct inode *inode = file->f_path.dentry->d_inode;
-       int offset;
-       int err = 0;
-       int ret;
-       int this_write;
-       struct buffer_head *bh;
-       struct buffer_head *head;
-       loff_t isize = i_size_read(inode);
-
-       memset(pages, 0, num_pages * sizeof(struct page *));
-
-       for (i = 0; i < num_pages; i++) {
-               pages[i] = grab_cache_page(inode->i_mapping, index + i);
-               if (!pages[i]) {
-                       err = -ENOMEM;
-                       goto failed_release;
-               }
-               offset = pos & (PAGE_CACHE_SIZE -1);
-               this_write = min(PAGE_CACHE_SIZE - offset, write_bytes);
-               if (!PageUptodate(pages[i]) &&
-                  (pages[i]->index == first_index ||
-                   pages[i]->index == last_index) && pos < isize) {
-                       ret = mpage_readpage(pages[i], btrfs_get_block);
-                       BUG_ON(ret);
-                       lock_page(pages[i]);
-               }
-               create_empty_buffers(pages[i], root->fs_info->sb->s_blocksize,
-                                    (1 << BH_Uptodate));
-               head = page_buffers(pages[i]);
-               bh = head;
-               do {
-                       err = btrfs_map_bh_to_logical(root, bh,
-                                                     alloc_extent_start);
-                       BUG_ON(err);
-                       if (err)
-                               goto failed_truncate;
-                       bh = bh->b_this_page;
-                       alloc_extent_start++;
-               } while (bh != head);
-               pos += this_write;
-               WARN_ON(this_write > write_bytes);
-               write_bytes -= this_write;
-       }
-       return 0;
-
-failed_release:
-       btrfs_drop_pages(pages, num_pages);
-       return err;
-
-failed_truncate:
-       btrfs_drop_pages(pages, num_pages);
-       if (pos > isize)
-               vmtruncate(inode, isize);
-       return err;
-}
-
-static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
-                               size_t count, loff_t *ppos)
-{
-       loff_t pos;
-       size_t num_written = 0;
-       int err = 0;
-       int ret = 0;
-       struct inode *inode = file->f_path.dentry->d_inode;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct page *pages[1];
-       unsigned long first_index;
-       unsigned long last_index;
-       u64 start_pos;
-       u64 num_blocks;
-       u64 alloc_extent_start;
-       u64 orig_extent_start;
-       struct btrfs_trans_handle *trans;
-
-       if (file->f_flags & O_DIRECT)
-               return -EINVAL;
-       pos = *ppos;
-
-       start_pos = pos & ~(root->blocksize - 1);
-       /* FIXME */
-       if (start_pos != pos)
-               return -EINVAL;
-       num_blocks = (count + pos - start_pos + root->blocksize - 1) >>
-                       inode->i_blkbits;
-
-       vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
-       current->backing_dev_info = inode->i_mapping->backing_dev_info;
-       err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-       if (err)
-               goto out;
-       if (count == 0)
-               goto out;
-       err = remove_suid(file->f_path.dentry);
-       if (err)
-               goto out;
-       file_update_time(file);
-       mutex_lock(&inode->i_mutex);
-       first_index = pos >> PAGE_CACHE_SHIFT;
-       last_index = (pos + count) >> PAGE_CACHE_SHIFT;
-
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       if (!trans) {
-               err = -ENOMEM;
-               goto out_unlock;
-       }
-       ret = btrfs_alloc_file_extent(trans, root, inode->i_ino,
-                                     start_pos, num_blocks, 1,
-                                     &alloc_extent_start);
-       BUG_ON(ret);
-
-       orig_extent_start = start_pos;
-       ret = btrfs_end_transaction(trans, root);
-       BUG_ON(ret);
-       mutex_unlock(&root->fs_info->fs_mutex);
-
-       while(count > 0) {
-               size_t offset = pos & (PAGE_CACHE_SIZE - 1);
-               size_t write_bytes = min(count, PAGE_CACHE_SIZE - offset);
-               size_t num_pages = (write_bytes + PAGE_CACHE_SIZE - 1) >>
-                                       PAGE_CACHE_SHIFT;
-               ret = prepare_pages(NULL, root, file, pages, num_pages,
-                                   pos, first_index, last_index,
-                                   write_bytes, alloc_extent_start);
-               BUG_ON(ret);
-               /* FIXME blocks != pagesize */
-               alloc_extent_start += num_pages;
-               ret = btrfs_copy_from_user(pos, num_pages,
-                                          write_bytes, pages, buf);
-               BUG_ON(ret);
-
-               ret = dirty_and_release_pages(NULL, root, file, pages,
-                                             num_pages, orig_extent_start,
-                                             pos, write_bytes);
-               BUG_ON(ret);
-               btrfs_drop_pages(pages, num_pages);
-
-               buf += write_bytes;
-               count -= write_bytes;
-               pos += write_bytes;
-               num_written += write_bytes;
-
-               balance_dirty_pages_ratelimited(inode->i_mapping);
-               cond_resched();
-       }
-out_unlock:
-       mutex_unlock(&inode->i_mutex);
-out:
-       *ppos = pos;
-       current->backing_dev_info = NULL;
-       return num_written ? num_written : err;
-}
-
-#if 0
-static ssize_t inline_one_page(struct btrfs_root *root, struct inode *inode,
-                          struct page *page, loff_t pos,
-                          size_t offset, size_t write_bytes)
-{
-       struct btrfs_path *path;
-       struct btrfs_trans_handle *trans;
-       struct btrfs_key key;
-       struct btrfs_leaf *leaf;
-       struct btrfs_key found_key;
-       int ret;
-       size_t copy_size = 0;
-       char *dst = NULL;
-       int err = 0;
-       size_t num_written = 0;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       key.objectid = inode->i_ino;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_INLINE_DATA_KEY);
-
-again:
-       key.offset = pos;
-       ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
-       if (ret < 0) {
-               err = ret;
-               goto out;
-       }
-       if (ret == 0) {
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               btrfs_disk_key_to_cpu(&found_key,
-                                     &leaf->items[path->slots[0]].key);
-               copy_size = btrfs_item_size(leaf->items + path->slots[0]);
-               dst = btrfs_item_ptr(leaf, path->slots[0], char);
-               copy_size = min(write_bytes, copy_size);
-               goto copyit;
-       } else {
-               int slot = path->slots[0];
-               if (slot > 0) {
-                       slot--;
-               }
-               // FIXME find max key
-               leaf = btrfs_buffer_leaf(path->nodes[0]);
-               btrfs_disk_key_to_cpu(&found_key,
-                                     &leaf->items[slot].key);
-               if (found_key.objectid != inode->i_ino)
-                       goto insert;
-               if (btrfs_key_type(&found_key) != BTRFS_INLINE_DATA_KEY)
-                       goto insert;
-               copy_size = btrfs_item_size(leaf->items + slot);
-               if (found_key.offset + copy_size <= pos)
-                       goto insert;
-               dst = btrfs_item_ptr(leaf, path->slots[0], char);
-               dst += pos - found_key.offset;
-               copy_size = copy_size - (pos - found_key.offset);
-               BUG_ON(copy_size < 0);
-               copy_size = min(write_bytes, copy_size);
-               WARN_ON(copy_size == 0);
-               goto copyit;
-       }
-insert:
-       btrfs_release_path(root, path);
-       copy_size = min(write_bytes,
-                       (size_t)BTRFS_LEAF_DATA_SIZE(root) -
-                       sizeof(struct btrfs_item) * 4);
-       ret = btrfs_insert_empty_item(trans, root, path, &key, copy_size);
-       BUG_ON(ret);
-       dst = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                            path->slots[0], char);
-copyit:
-       WARN_ON(copy_size == 0);
-       WARN_ON(dst + copy_size >
-               btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                                                path->slots[0], char) +
-               btrfs_item_size(btrfs_buffer_leaf(path->nodes[0])->items +
-                                                 path->slots[0]));
-       btrfs_memcpy(root, path->nodes[0]->b_data, dst,
-                    page_address(page) + offset, copy_size);
-       mark_buffer_dirty(path->nodes[0]);
-       btrfs_release_path(root, path);
-       pos += copy_size;
-       offset += copy_size;
-       num_written += copy_size;
-       write_bytes -= copy_size;
-       if (write_bytes)
-               goto again;
-out:
-       btrfs_free_path(path);
-       ret = btrfs_end_transaction(trans, root);
-       BUG_ON(ret);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return num_written ? num_written : err;
-}
-
-static ssize_t btrfs_file_inline_write(struct file *file,
-                                      const char __user *buf,
-                                      size_t count, loff_t *ppos)
+static void btrfs_unlockfs(struct super_block *sb)
 {
-       loff_t pos;
-       size_t num_written = 0;
-       int err = 0;
-       int ret = 0;
-       struct inode *inode = file->f_path.dentry->d_inode;
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       unsigned long page_index;
-
-       if (file->f_flags & O_DIRECT)
-               return -EINVAL;
-       pos = *ppos;
-
-       vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
-       current->backing_dev_info = inode->i_mapping->backing_dev_info;
-       err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
-       if (err)
-               goto out;
-       if (count == 0)
-               goto out;
-       err = remove_suid(file->f_path.dentry);
-       if (err)
-               goto out;
-       file_update_time(file);
-       mutex_lock(&inode->i_mutex);
-       while(count > 0) {
-               size_t offset = pos & (PAGE_CACHE_SIZE - 1);
-               size_t write_bytes = min(count, PAGE_CACHE_SIZE - offset);
-               struct page *page;
-
-               page_index = pos >> PAGE_CACHE_SHIFT;
-               page = grab_cache_page(inode->i_mapping, page_index);
-               if (!PageUptodate(page)) {
-                       ret = mpage_readpage(page, btrfs_get_block);
-                       BUG_ON(ret);
-                       lock_page(page);
-               }
-               ret = btrfs_copy_from_user(pos, 1,
-                                          write_bytes, &page, buf);
-               BUG_ON(ret);
-               write_bytes = inline_one_page(root, inode, page, pos,
-                                     offset, write_bytes);
-               SetPageUptodate(page);
-               if (write_bytes > 0 && pos + write_bytes > inode->i_size) {
-                       i_size_write(inode, pos + write_bytes);
-                       mark_inode_dirty(inode);
-               }
-               page_cache_release(page);
-               unlock_page(page);
-               if (write_bytes < 0)
-                       goto out_unlock;
-               buf += write_bytes;
-               count -= write_bytes;
-               pos += write_bytes;
-               num_written += write_bytes;
-
-               balance_dirty_pages_ratelimited(inode->i_mapping);
-               cond_resched();
-       }
-out_unlock:
-       mutex_unlock(&inode->i_mutex);
-out:
-       *ppos = pos;
-       current->backing_dev_info = NULL;
-       return num_written ? num_written : err;
-}
-#endif
-
-static int btrfs_read_actor(read_descriptor_t *desc, struct page *page,
-                       unsigned long offset, unsigned long size)
-{
-       char *kaddr;
-       unsigned long left, count = desc->count;
-       struct inode *inode = page->mapping->host;
-
-       if (size > count)
-               size = count;
-
-       if (!PageChecked(page)) {
-               /* FIXME, do it per block */
-               struct btrfs_root *root = BTRFS_I(inode)->root;
-               int ret = btrfs_csum_verify_file_block(root,
-                                         page->mapping->host->i_ino,
-                                         page->index << PAGE_CACHE_SHIFT,
-                                         kmap(page), PAGE_CACHE_SIZE);
-               if (ret) {
-                       printk("failed to verify ino %lu page %lu\n",
-                              page->mapping->host->i_ino,
-                              page->index);
-                       memset(page_address(page), 0, PAGE_CACHE_SIZE);
-               }
-               SetPageChecked(page);
-               kunmap(page);
-       }
-       /*
-        * Faults on the destination of a read are common, so do it before
-        * taking the kmap.
-        */
-       if (!fault_in_pages_writeable(desc->arg.buf, size)) {
-               kaddr = kmap_atomic(page, KM_USER0);
-               left = __copy_to_user_inatomic(desc->arg.buf,
-                                               kaddr + offset, size);
-               kunmap_atomic(kaddr, KM_USER0);
-               if (left == 0)
-                       goto success;
-       }
-
-       /* Do it the slow way */
-       kaddr = kmap(page);
-       left = __copy_to_user(desc->arg.buf, kaddr + offset, size);
-       kunmap(page);
-
-       if (left) {
-               size -= left;
-               desc->error = -EFAULT;
-       }
-success:
-       desc->count = count - size;
-       desc->written += size;
-       desc->arg.buf += size;
-       return size;
-}
-
-/**
- * btrfs_file_aio_read - filesystem read routine
- * @iocb:      kernel I/O control block
- * @iov:       io vector request
- * @nr_segs:   number of segments in the iovec
- * @pos:       current file position
- */
-static ssize_t btrfs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
-                                  unsigned long nr_segs, loff_t pos)
-{
-       struct file *filp = iocb->ki_filp;
-       ssize_t retval;
-       unsigned long seg;
-       size_t count;
-       loff_t *ppos = &iocb->ki_pos;
-
-       count = 0;
-       for (seg = 0; seg < nr_segs; seg++) {
-               const struct iovec *iv = &iov[seg];
-
-               /*
-                * If any segment has a negative length, or the cumulative
-                * length ever wraps negative then return -EINVAL.
-                */
-               count += iv->iov_len;
-               if (unlikely((ssize_t)(count|iv->iov_len) < 0))
-                       return -EINVAL;
-               if (access_ok(VERIFY_WRITE, iv->iov_base, iv->iov_len))
-                       continue;
-               if (seg == 0)
-                       return -EFAULT;
-               nr_segs = seg;
-               count -= iv->iov_len;   /* This segment is no good */
-               break;
-       }
-       retval = 0;
-       if (count) {
-               for (seg = 0; seg < nr_segs; seg++) {
-                       read_descriptor_t desc;
-
-                       desc.written = 0;
-                       desc.arg.buf = iov[seg].iov_base;
-                       desc.count = iov[seg].iov_len;
-                       if (desc.count == 0)
-                               continue;
-                       desc.error = 0;
-                       do_generic_file_read(filp, ppos, &desc,
-                                            btrfs_read_actor);
-                       retval += desc.written;
-                       if (desc.error) {
-                               retval = retval ?: desc.error;
-                               break;
-                       }
-               }
-       }
-       return retval;
-}
-
-static int create_subvol(struct btrfs_root *root, char *name, int namelen)
-{
-       struct btrfs_trans_handle *trans;
-       struct btrfs_key key;
-       struct btrfs_root_item root_item;
-       struct btrfs_inode_item *inode_item;
-       struct buffer_head *subvol;
-       struct btrfs_leaf *leaf;
-       struct btrfs_root *new_root;
-       struct inode *inode;
-       int ret;
-       u64 objectid;
-       u64 new_dirid = BTRFS_FIRST_FREE_OBJECTID;
-
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       BUG_ON(!trans);
-
-       subvol = btrfs_alloc_free_block(trans, root);
-       leaf = btrfs_buffer_leaf(subvol);
-       btrfs_set_header_nritems(&leaf->header, 0);
-       btrfs_set_header_level(&leaf->header, 0);
-       btrfs_set_header_blocknr(&leaf->header, bh_blocknr(subvol));
-       btrfs_set_header_generation(&leaf->header, trans->transid);
-       memcpy(leaf->header.fsid, root->fs_info->disk_super->fsid,
-              sizeof(leaf->header.fsid));
-
-       inode_item = &root_item.inode;
-       memset(inode_item, 0, sizeof(*inode_item));
-       btrfs_set_inode_generation(inode_item, 1);
-       btrfs_set_inode_size(inode_item, 3);
-       btrfs_set_inode_nlink(inode_item, 1);
-       btrfs_set_inode_nblocks(inode_item, 1);
-       btrfs_set_inode_mode(inode_item, S_IFDIR | 0755);
-
-       btrfs_set_root_blocknr(&root_item, bh_blocknr(subvol));
-       btrfs_set_root_refs(&root_item, 1);
-
-       mark_buffer_dirty(subvol);
-       brelse(subvol);
-       subvol = NULL;
-
-       ret = btrfs_find_free_objectid(trans, root->fs_info->tree_root,
-                                      0, &objectid);
-       BUG_ON(ret);
-
-       btrfs_set_root_dirid(&root_item, new_dirid);
-
-       key.objectid = objectid;
-       key.offset = 1;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY);
-       ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key,
-                               &root_item);
-       BUG_ON(ret);
-
-       /*
-        * insert the directory item
-        */
-       key.offset = (u64)-1;
-       ret = btrfs_insert_dir_item(trans, root->fs_info->tree_root,
-                                   name, namelen,
-                                   root->fs_info->sb->s_root->d_inode->i_ino,
-                                   &key, 0);
-       BUG_ON(ret);
-
-       ret = btrfs_commit_transaction(trans, root);
-       BUG_ON(ret);
-
-       new_root = btrfs_read_fs_root(root->fs_info, &key);
-       BUG_ON(!new_root);
-
-       trans = btrfs_start_transaction(new_root, 1);
-       BUG_ON(!trans);
-
-       inode = btrfs_new_inode(trans, new_root, new_dirid, S_IFDIR | 0700);
-       inode->i_op = &btrfs_dir_inode_operations;
-       inode->i_fop = &btrfs_dir_file_operations;
-
-       ret = btrfs_make_empty_dir(trans, new_root, new_dirid, new_dirid);
-       BUG_ON(ret);
-
-       inode->i_nlink = 1;
-       inode->i_size = 6;
-       ret = btrfs_update_inode(trans, new_root, inode);
-       BUG_ON(ret);
-
-       ret = btrfs_commit_transaction(trans, new_root);
-       BUG_ON(ret);
-
-       iput(inode);
-
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return 0;
-}
-
-static int create_snapshot(struct btrfs_root *root, char *name, int namelen)
-{
-       struct btrfs_trans_handle *trans;
-       struct btrfs_key key;
-       struct btrfs_root_item new_root_item;
-       int ret;
-       u64 objectid;
-
-       if (!root->ref_cows)
-               return -EINVAL;
-
-       mutex_lock(&root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(root, 1);
-       BUG_ON(!trans);
-
-       ret = btrfs_update_inode(trans, root, root->inode);
-       BUG_ON(ret);
-
-       ret = btrfs_find_free_objectid(trans, root->fs_info->tree_root,
-                                      0, &objectid);
-       BUG_ON(ret);
-
-       memcpy(&new_root_item, &root->root_item,
-              sizeof(new_root_item));
-
-       key.objectid = objectid;
-       key.offset = 1;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_ROOT_ITEM_KEY);
-       btrfs_set_root_blocknr(&new_root_item, bh_blocknr(root->node));
-
-       ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key,
-                               &new_root_item);
-       BUG_ON(ret);
-
-       /*
-        * insert the directory item
-        */
-       key.offset = (u64)-1;
-       ret = btrfs_insert_dir_item(trans, root->fs_info->tree_root,
-                                   name, namelen,
-                                   root->fs_info->sb->s_root->d_inode->i_ino,
-                                   &key, 0);
-
-       BUG_ON(ret);
-
-       ret = btrfs_inc_root_ref(trans, root);
-       BUG_ON(ret);
-
-       ret = btrfs_commit_transaction(trans, root);
-       BUG_ON(ret);
-       mutex_unlock(&root->fs_info->fs_mutex);
-       return 0;
-}
-
-static int add_disk(struct btrfs_root *root, char *name, int namelen)
-{
-       struct block_device *bdev;
-       struct btrfs_path *path;
-       struct super_block *sb = root->fs_info->sb;
-       struct btrfs_root *dev_root = root->fs_info->dev_root;
-       struct btrfs_trans_handle *trans;
-       struct btrfs_device_item *dev_item;
-       struct btrfs_key key;
-       u16 item_size;
-       u64 num_blocks;
-       u64 new_blocks;
-       u64 device_id;
-       int ret;
-
-printk("adding disk %s\n", name);
-       path = btrfs_alloc_path();
-       if (!path)
-               return -ENOMEM;
-       num_blocks = btrfs_super_total_blocks(root->fs_info->disk_super);
-       bdev = open_bdev_excl(name, O_RDWR, sb);
-       if (IS_ERR(bdev)) {
-               ret = PTR_ERR(bdev);
-printk("open bdev excl failed ret %d\n", ret);
-               goto out_nolock;
-       }
-       set_blocksize(bdev, sb->s_blocksize);
-       new_blocks = bdev->bd_inode->i_size >> sb->s_blocksize_bits;
-       key.objectid = num_blocks;
-       key.offset = new_blocks;
-       key.flags = 0;
-       btrfs_set_key_type(&key, BTRFS_DEV_ITEM_KEY);
-
-       mutex_lock(&dev_root->fs_info->fs_mutex);
-       trans = btrfs_start_transaction(dev_root, 1);
-       item_size = sizeof(*dev_item) + namelen;
-printk("insert empty on %Lu %Lu %u size %d\n", num_blocks, new_blocks, key.flags, item_size);
-       ret = btrfs_insert_empty_item(trans, dev_root, path, &key, item_size);
-       if (ret) {
-printk("insert failed %d\n", ret);
-               close_bdev_excl(bdev);
-               if (ret > 0)
-                       ret = -EEXIST;
-               goto out;
-       }
-       dev_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
-                                 path->slots[0], struct btrfs_device_item);
-       btrfs_set_device_pathlen(dev_item, namelen);
-       memcpy(dev_item + 1, name, namelen);
-
-       device_id = btrfs_super_last_device_id(root->fs_info->disk_super) + 1;
-       btrfs_set_super_last_device_id(root->fs_info->disk_super, device_id);
-       btrfs_set_device_id(dev_item, device_id);
-       mark_buffer_dirty(path->nodes[0]);
-
-       ret = btrfs_insert_dev_radix(root, bdev, device_id, num_blocks,
-                                    new_blocks);
-
-       if (!ret) {
-               btrfs_set_super_total_blocks(root->fs_info->disk_super,
-                                            num_blocks + new_blocks);
-               i_size_write(root->fs_info->btree_inode,
-                            (num_blocks + new_blocks) <<
-                            root->fs_info->btree_inode->i_blkbits);
-       }
-
-out:
-       ret = btrfs_commit_transaction(trans, dev_root);
-       BUG_ON(ret);
-       mutex_unlock(&root->fs_info->fs_mutex);
-out_nolock:
-       btrfs_free_path(path);
-
-       return ret;
-}
-
-static int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
-                      cmd, unsigned long arg)
-{
-       struct btrfs_root *root = BTRFS_I(inode)->root;
-       struct btrfs_ioctl_vol_args vol_args;
-       int ret = 0;
-       int namelen;
-       struct btrfs_path *path;
-       u64 root_dirid;
-
-       switch (cmd) {
-       case BTRFS_IOC_SNAP_CREATE:
-               if (copy_from_user(&vol_args,
-                                  (struct btrfs_ioctl_vol_args __user *)arg,
-                                  sizeof(vol_args)))
-                       return -EFAULT;
-               namelen = strlen(vol_args.name);
-               if (namelen > BTRFS_VOL_NAME_MAX)
-                       return -EINVAL;
-               path = btrfs_alloc_path();
-               if (!path)
-                       return -ENOMEM;
-               root_dirid = root->fs_info->sb->s_root->d_inode->i_ino,
-               mutex_lock(&root->fs_info->fs_mutex);
-               ret = btrfs_lookup_dir_item(NULL, root->fs_info->tree_root,
-                                   path, root_dirid,
-                                   vol_args.name, namelen, 0);
-               mutex_unlock(&root->fs_info->fs_mutex);
-               btrfs_free_path(path);
-               if (ret == 0)
-                       return -EEXIST;
-
-               if (root == root->fs_info->tree_root)
-                       ret = create_subvol(root, vol_args.name, namelen);
-               else
-                       ret = create_snapshot(root, vol_args.name, namelen);
-               WARN_ON(ret);
-               break;
-       case BTRFS_IOC_ADD_DISK:
-               if (copy_from_user(&vol_args,
-                                  (struct btrfs_ioctl_vol_args __user *)arg,
-                                  sizeof(vol_args)))
-                       return -EFAULT;
-               namelen = strlen(vol_args.name);
-               if (namelen > BTRFS_VOL_NAME_MAX)
-                       return -EINVAL;
-               vol_args.name[namelen] = '\0';
-               ret = add_disk(root, vol_args.name, namelen);
-               break;
-       default:
-               return -ENOTTY;
-       }
-       return ret;
-}
-
-static struct kmem_cache *btrfs_inode_cachep;
-struct kmem_cache *btrfs_trans_handle_cachep;
-struct kmem_cache *btrfs_transaction_cachep;
-struct kmem_cache *btrfs_bit_radix_cachep;
-struct kmem_cache *btrfs_path_cachep;
-
-/*
- * Called inside transaction, so use GFP_NOFS
- */
-static struct inode *btrfs_alloc_inode(struct super_block *sb)
-{
-       struct btrfs_inode *ei;
-
-       ei = kmem_cache_alloc(btrfs_inode_cachep, GFP_NOFS);
-       if (!ei)
-               return NULL;
-       return &ei->vfs_inode;
-}
-
-static void btrfs_destroy_inode(struct inode *inode)
-{
-       WARN_ON(!list_empty(&inode->i_dentry));
-       WARN_ON(inode->i_data.nrpages);
-
-       kmem_cache_free(btrfs_inode_cachep, BTRFS_I(inode));
-}
-
-static void init_once(void * foo, struct kmem_cache * cachep,
-                     unsigned long flags)
-{
-       struct btrfs_inode *ei = (struct btrfs_inode *) foo;
-
-       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-           SLAB_CTOR_CONSTRUCTOR) {
-               inode_init_once(&ei->vfs_inode);
-       }
-}
-
-static int init_inodecache(void)
-{
-       btrfs_inode_cachep = kmem_cache_create("btrfs_inode_cache",
-                                            sizeof(struct btrfs_inode),
-                                            0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD),
-                                            init_once, NULL);
-       btrfs_trans_handle_cachep = kmem_cache_create("btrfs_trans_handle_cache",
-                                            sizeof(struct btrfs_trans_handle),
-                                            0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD),
-                                            NULL, NULL);
-       btrfs_transaction_cachep = kmem_cache_create("btrfs_transaction_cache",
-                                            sizeof(struct btrfs_transaction),
-                                            0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD),
-                                            NULL, NULL);
-       btrfs_path_cachep = kmem_cache_create("btrfs_path_cache",
-                                            sizeof(struct btrfs_transaction),
-                                            0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD),
-                                            NULL, NULL);
-       btrfs_bit_radix_cachep = kmem_cache_create("btrfs_radix",
-                                            256,
-                                            0, (SLAB_RECLAIM_ACCOUNT|
-                                               SLAB_MEM_SPREAD |
-                                               SLAB_DESTROY_BY_RCU),
-                                            NULL, NULL);
-       if (btrfs_inode_cachep == NULL || btrfs_trans_handle_cachep == NULL ||
-           btrfs_transaction_cachep == NULL || btrfs_bit_radix_cachep == NULL)
-               return -ENOMEM;
-       return 0;
-}
-
-static void destroy_inodecache(void)
-{
-       kmem_cache_destroy(btrfs_inode_cachep);
-       kmem_cache_destroy(btrfs_trans_handle_cachep);
-       kmem_cache_destroy(btrfs_transaction_cachep);
-       kmem_cache_destroy(btrfs_bit_radix_cachep);
-       kmem_cache_destroy(btrfs_path_cachep);
-}
-
-static int btrfs_get_sb(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data, struct vfsmount *mnt)
-{
-       return get_sb_bdev(fs_type, flags, dev_name, data,
-                          btrfs_fill_super, mnt);
+       struct btrfs_root *root = btrfs_sb(sb);
+       mutex_unlock(&root->fs_info->cleaner_mutex);
+       mutex_unlock(&root->fs_info->transaction_kthread_mutex);
 }
 
-static struct file_system_type btrfs_fs_type = {
-       .owner          = THIS_MODULE,
-       .name           = "btrfs",
-       .get_sb         = btrfs_get_sb,
-       .kill_sb        = kill_block_super,
-       .fs_flags       = FS_REQUIRES_DEV,
-};
-
 static struct super_operations btrfs_super_ops = {
-       .statfs         = simple_statfs,
        .delete_inode   = btrfs_delete_inode,
        .put_super      = btrfs_put_super,
-       .read_inode     = btrfs_read_locked_inode,
        .write_super    = btrfs_write_super,
        .sync_fs        = btrfs_sync_fs,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+       .read_inode     = btrfs_read_locked_inode,
+#else
+       .show_options   = generic_show_options,
+#endif
        .write_inode    = btrfs_write_inode,
+       .dirty_inode    = btrfs_dirty_inode,
        .alloc_inode    = btrfs_alloc_inode,
        .destroy_inode  = btrfs_destroy_inode,
+       .statfs         = btrfs_statfs,
+       .write_super_lockfs = btrfs_write_super_lockfs,
+       .unlockfs       = btrfs_unlockfs,
 };
 
-static struct inode_operations btrfs_dir_inode_operations = {
-       .lookup         = btrfs_lookup,
-       .create         = btrfs_create,
-       .unlink         = btrfs_unlink,
-       .mkdir          = btrfs_mkdir,
-       .rmdir          = btrfs_rmdir,
+static const struct file_operations btrfs_ctl_fops = {
+       .unlocked_ioctl  = btrfs_control_ioctl,
+       .compat_ioctl = btrfs_control_ioctl,
+       .owner   = THIS_MODULE,
 };
 
-static struct inode_operations btrfs_dir_ro_inode_operations = {
-       .lookup         = btrfs_lookup,
+static struct miscdevice btrfs_misc = {
+       .minor          = MISC_DYNAMIC_MINOR,
+       .name           = "btrfs-control",
+       .fops           = &btrfs_ctl_fops
 };
 
-static struct file_operations btrfs_dir_file_operations = {
-       .llseek         = generic_file_llseek,
-       .read           = generic_read_dir,
-       .readdir        = btrfs_readdir,
-       .ioctl          = btrfs_ioctl,
-};
-
-static struct address_space_operations btrfs_aops = {
-       .readpage       = btrfs_readpage,
-       .writepage      = btrfs_writepage,
-       .sync_page      = block_sync_page,
-       .prepare_write  = btrfs_prepare_write,
-       .commit_write   = btrfs_commit_write,
-};
-
-static struct inode_operations btrfs_file_inode_operations = {
-       .truncate       = btrfs_truncate,
-};
+static int btrfs_interface_init(void)
+{
+       return misc_register(&btrfs_misc);
+}
 
-static struct file_operations btrfs_file_operations = {
-       .llseek         = generic_file_llseek,
-       .read           = do_sync_read,
-       .aio_read       = btrfs_file_aio_read,
-       .write          = btrfs_file_write,
-       .mmap           = generic_file_mmap,
-       .open           = generic_file_open,
-       .ioctl          = btrfs_ioctl,
-};
+void btrfs_interface_exit(void)
+{
+       if (misc_deregister(&btrfs_misc) < 0)
+               printk("misc_deregister failed for control device");
+}
 
 static int __init init_btrfs_fs(void)
 {
        int err;
-       printk("btrfs loaded!\n");
-       err = init_inodecache();
+
+       err = btrfs_init_sysfs();
        if (err)
                return err;
-       kset_set_kset_s(&btrfs_subsys, fs_subsys);
-       err = subsystem_register(&btrfs_subsys);
+
+       err = btrfs_init_cachep();
        if (err)
-               goto out;
-       return register_filesystem(&btrfs_fs_type);
-out:
-       destroy_inodecache();
+               goto free_sysfs;
+
+       err = extent_io_init();
+       if (err)
+               goto free_cachep;
+
+       err = extent_map_init();
+       if (err)
+               goto free_extent_io;
+
+       err = btrfs_interface_init();
+       if (err)
+               goto free_extent_map;
+       err = register_filesystem(&btrfs_fs_type);
+       if (err)
+               goto unregister_ioctl;
+
+       printk(KERN_INFO "%s loaded\n", BTRFS_BUILD_VERSION);
+       return 0;
+
+unregister_ioctl:
+       btrfs_interface_exit();
+free_extent_map:
+       extent_map_exit();
+free_extent_io:
+       extent_io_exit();
+free_cachep:
+       btrfs_destroy_cachep();
+free_sysfs:
+       btrfs_exit_sysfs();
        return err;
 }
 
 static void __exit exit_btrfs_fs(void)
 {
-       destroy_inodecache();
+       btrfs_destroy_cachep();
+       extent_map_exit();
+       extent_io_exit();
+       btrfs_interface_exit();
        unregister_filesystem(&btrfs_fs_type);
-       subsystem_unregister(&btrfs_subsys);
-       printk("btrfs unloaded\n");
+       btrfs_exit_sysfs();
+       btrfs_cleanup_fs_uuids();
 }
 
 module_init(init_btrfs_fs)