Btrfs: drop the inode map tree
[deliverable/linux.git] / fs / btrfs / super.c
index 7914b31f5bcd42de681020d23bab4429a85678c2..3e8bfb0e5d7e8253d67814c86b45af35177693a9 100644 (file)
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
+#include "btrfs_inode.h"
+#include "ioctl.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
 
 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;
@@ -26,23 +47,25 @@ static struct file_operations btrfs_file_operations;
 
 static void btrfs_read_locked_inode(struct inode *inode)
 {
-       struct btrfs_path path;
+       struct btrfs_path *path;
        struct btrfs_inode_item *inode_item;
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
+       struct btrfs_key location;
        int ret;
 
-       btrfs_init_path(&path);
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
+       btrfs_init_path(path);
        mutex_lock(&root->fs_info->fs_mutex);
 
-       ret = btrfs_lookup_inode(NULL, root, &path, inode->i_ino, 0);
+       memcpy(&location, &BTRFS_I(inode)->location, sizeof(location));
+       ret = btrfs_lookup_inode(NULL, root, path, &location, 0);
        if (ret) {
-               btrfs_release_path(root, &path);
-               mutex_unlock(&root->fs_info->fs_mutex);
-               make_bad_inode(inode);
-               return;
+               btrfs_free_path(path);
+               goto make_bad;
        }
-       inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),
-                                 path.slots[0],
+       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);
@@ -58,8 +81,12 @@ static void btrfs_read_locked_inode(struct inode *inode)
        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_release_path(root, &path);
+
+       btrfs_free_path(path);
+       inode_item = NULL;
+
        mutex_unlock(&root->fs_info->fs_mutex);
+
        switch (inode->i_mode & S_IFMT) {
 #if 0
        default:
@@ -73,14 +100,23 @@ static void btrfs_read_locked_inode(struct inode *inode)
                inode->i_op = &btrfs_file_inode_operations;
                break;
        case S_IFDIR:
-               inode->i_op = &btrfs_dir_inode_operations;
                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,
@@ -88,15 +124,17 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
                              struct inode *dir,
                              struct dentry *dentry)
 {
-       struct btrfs_path path;
+       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;
 
-       btrfs_init_path(&path);
-       ret = btrfs_lookup_dir_item(trans, root, &path, dir->i_ino,
+       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;
@@ -104,17 +142,28 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
                ret = -ENOENT;
                goto err;
        }
-       di = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+       di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                            struct btrfs_dir_item);
-       objectid = btrfs_dir_objectid(di);
+       objectid = btrfs_disk_key_objectid(&di->location);
 
-       ret = btrfs_del_item(trans, root, &path);
+       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);
-       if (ret == 0)
+       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);
+       }
        return ret;
 }
 
@@ -124,7 +173,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry)
        struct btrfs_trans_handle *trans;
        int ret;
 
-       root = btrfs_sb(dir->i_sb);
+       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);
@@ -138,59 +187,59 @@ 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_sb(dir->i_sb);
-       struct btrfs_path path;
+       struct btrfs_root *root = BTRFS_I(dir)->root;
+       struct btrfs_path *path;
        struct btrfs_key key;
        struct btrfs_trans_handle *trans;
-       struct btrfs_disk_key *found_key;
+       struct btrfs_key found_key;
+       int found_type;
        struct btrfs_leaf *leaf;
+       char *goodnames = "..";
 
-       btrfs_init_path(&path);
+       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 = 0;
-       btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
-       ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
-       if (ret < 0) {
-               err = ret;
-               goto out;
-       }
+       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;
+               }
+               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);
 
-       BUG_ON(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) {
-               err = -ENOENT;
-               goto out;
-       }
-       if (btrfs_disk_key_type(found_key) != BTRFS_DIR_ITEM_KEY ||
-           btrfs_disk_key_offset(found_key) != 2) {
-               err = -ENOTEMPTY;
-               goto out;
-       }
-       ret = btrfs_del_item(trans, root, &path);
-       BUG_ON(ret);
-       btrfs_release_path(root, &path);
-       key.offset = 1;
-       ret = btrfs_search_slot(trans, root, &key, &path, -1, 1);
-       if (ret < 0) {
-               err = ret;
-               goto out;
-       }
-       if (ret > 0) {
-               err = -ENOTEMPTY;
-               goto out;
-       }
-       ret = btrfs_del_item(trans, root, &path);
-       if (ret) {
-               err = ret;
-               goto out;
+               if (found_type == BTRFS_DIR_ITEM_KEY && found_key.offset == 1)
+                       break;
+               btrfs_release_path(root, path);
        }
-       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);
@@ -198,6 +247,8 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
                inode->i_size = 0;
        }
 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)
@@ -209,34 +260,20 @@ static int btrfs_free_inode(struct btrfs_trans_handle *trans,
                            struct btrfs_root *root,
                            struct inode *inode)
 {
-       u64 objectid = inode->i_ino;
-       struct btrfs_path path;
-       struct btrfs_inode_map_item *map;
-       struct btrfs_key stat_data_key;
+       struct btrfs_path *path;
        int ret;
+
        clear_inode(inode);
-       btrfs_init_path(&path);
-       ret = btrfs_lookup_inode_map(trans, root, &path, objectid, -1);
-       if (ret) {
-               if (ret > 0)
-                       ret = -ENOENT;
-               btrfs_release_path(root, &path);
-               goto error;
-       }
-       map = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
-                           struct btrfs_inode_map_item);
-       btrfs_disk_key_to_cpu(&stat_data_key, &map->key);
-       ret = btrfs_del_item(trans, root->fs_info->inode_root, &path);
-       BUG_ON(ret);
-       btrfs_release_path(root, &path);
-       btrfs_init_path(&path);
 
-       ret = btrfs_lookup_inode(trans, root, &path, objectid, -1);
+       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);
+       ret = btrfs_del_item(trans, root, path);
        BUG_ON(ret);
-       btrfs_release_path(root, &path);
-error:
+       btrfs_free_path(path);
        return ret;
 }
 
@@ -245,64 +282,79 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
                                   struct inode *inode)
 {
        int ret;
-       struct btrfs_path path;
+       struct btrfs_path *path;
        struct btrfs_key key;
        struct btrfs_disk_key *found_key;
        struct btrfs_leaf *leaf;
-       struct btrfs_file_extent_item *fi;
-       u64 extent_start;
-       u64 extent_num_blocks;
+       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;
-       btrfs_set_key_type(&key, BTRFS_EXTENT_DATA_KEY);
+       /*
+        * use BTRFS_CSUM_ITEM_KEY because it is larger than inline keys
+        * or extent data
+        */
+       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);
+               btrfs_init_path(path);
+               ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
                if (ret < 0) {
-                       btrfs_release_path(root, &path);
                        goto error;
                }
                if (ret > 0) {
-                       BUG_ON(path.slots[0] == 0);
-                       path.slots[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;
+               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)
                        break;
-               if (btrfs_disk_key_type(found_key) != BTRFS_EXTENT_DATA_KEY)
+               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)
                        break;
                if (btrfs_disk_key_offset(found_key) < inode->i_size)
                        break;
-               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);
-               key.offset = btrfs_disk_key_offset(found_key) - 1;
-               ret = btrfs_del_item(trans, root, &path);
-               BUG_ON(ret);
-               inode->i_blocks -= btrfs_file_extent_num_blocks(fi) >> 9;
-               btrfs_release_path(root, &path);
-               ret = btrfs_free_extent(trans, root, extent_start,
-                                       extent_num_blocks, 0);
+               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);
-               if (key.offset + 1 == 0)
-                       break;
+               btrfs_release_path(root, path);
+               if (found_extent) {
+                       ret = btrfs_free_extent(trans, root, extent_start,
+                                               extent_num_blocks, 0);
+                       BUG_ON(ret);
+               }
        }
-       btrfs_release_path(root, &path);
        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_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
 
        truncate_inode_pages(&inode->i_data, 0);
@@ -325,48 +377,138 @@ no_delete:
 }
 
 static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
-                             ino_t *ino)
+                              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_sb(dir->i_sb);
+       struct btrfs_path *path;
+       struct btrfs_root *root = BTRFS_I(dir)->root;
        int ret;
 
-       btrfs_init_path(&path);
-       ret = btrfs_lookup_dir_item(NULL, root, &path, dir->i_ino, name,
+       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)) {
-               *ino = 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],
+       di = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                            struct btrfs_dir_item);
-       *ino = btrfs_dir_objectid(di);
+       btrfs_disk_key_to_cpu(location, &di->location);
 out:
-       btrfs_release_path(root, &path);
+       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;
+       return 0;
+}
+
+int btrfs_find_actor(struct inode *inode, void *opaque)
+{
+       struct btrfs_iget_args *args = opaque;
+       return (args->ino == inode->i_ino &&
+               args->root == BTRFS_I(inode)->root);
+}
+
+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;
+}
+
 static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry,
                                   struct nameidata *nd)
 {
        struct inode * inode;
-       ino_t ino;
+       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;
 
        if (dentry->d_name.len > BTRFS_NAME_LEN)
                return ERR_PTR(-ENAMETOOLONG);
-
-       ret = btrfs_inode_by_name(dir, dentry, &ino);
+       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 (ino) {
-               inode = iget(dir->i_sb, ino);
+       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) {
+                               ret = radix_tree_insert(
+                                               &root->fs_info->fs_roots_radix,
+                                               (unsigned long)sub_root,
+                                               sub_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);
 }
@@ -374,11 +516,11 @@ static struct dentry *btrfs_lookup(struct inode *dir, struct dentry *dentry,
 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_sb(inode->i_sb);
+       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;
+       struct btrfs_path *path;
        int ret;
        u32 nritems;
        struct btrfs_leaf *leaf;
@@ -386,58 +528,67 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
        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, BTRFS_DIR_ITEM_KEY);
+       btrfs_set_key_type(&key, key_type);
        key.offset = filp->f_pos;
-       btrfs_init_path(&path);
-       ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
-       if (ret < 0) {
+       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]);
+               leaf = btrfs_buffer_leaf(path->nodes[0]);
                nritems = btrfs_header_nritems(&leaf->header);
-               slot = path.slots[0];
+               slot = path->slots[0];
                if (advance || slot >= nritems) {
                        if (slot >= nritems -1) {
-                               ret = btrfs_next_leaf(root, &path);
+                               ret = btrfs_next_leaf(root, path);
                                if (ret)
                                        break;
-                               leaf = btrfs_buffer_leaf(path.nodes[0]);
+                               leaf = btrfs_buffer_leaf(path->nodes[0]);
                                nritems = btrfs_header_nritems(&leaf->header);
-                               slot = path.slots[0];
+                               slot = path->slots[0];
                        } else {
                                slot++;
-                               path.slots[0]++;
+                               path->slots[0]++;
                        }
                }
                advance = 1;
                item = leaf->items + slot;
                if (btrfs_disk_key_objectid(&item->key) != key.objectid)
                        break;
-               if (btrfs_disk_key_type(&item->key) != BTRFS_DIR_ITEM_KEY)
+               if (key_type == BTRFS_DIR_INDEX_KEY &&
+                   btrfs_disk_key_offset(&item->key) > root->highest_inode)
+                       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_dir_objectid(di), d_type);
-               if (over) {
-                       filp->f_pos = btrfs_disk_key_offset(&item->key);
-                       break;
-               }
-               filp->f_pos = btrfs_disk_key_offset(&item->key) + 1;
+                              btrfs_disk_key_objectid(&di->location), d_type);
+               if (over)
+                       goto nopos;
        }
+       filp->f_pos++;
+nopos:
        ret = 0;
 err:
-       btrfs_release_path(root, &path);
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
+       mutex_unlock(&root->fs_info->fs_mutex);
        return ret;
 }
 
@@ -458,35 +609,35 @@ static int btrfs_fill_super(struct super_block * sb, void * data, int silent)
        struct inode * inode;
        struct dentry * root_dentry;
        struct btrfs_super_block *disk_super;
-       struct buffer_head *bh;
-       struct btrfs_root *root;
+       struct btrfs_root *tree_root;
+       struct btrfs_inode *bi;
 
        sb->s_maxbytes = MAX_LFS_FILESIZE;
-       sb->s_blocksize = PAGE_CACHE_SIZE;
-       sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
        sb->s_magic = BTRFS_SUPER_MAGIC;
        sb->s_op = &btrfs_super_ops;
        sb->s_time_gran = 1;
 
-       bh = sb_bread(sb, BTRFS_SUPER_INFO_OFFSET / sb->s_blocksize);
-       if (!bh) {
-               printk("btrfs: unable to read on disk super\n");
-               return -EIO;
-       }
-       disk_super = (struct btrfs_super_block *)bh->b_data;
-       root = open_ctree(sb, bh, disk_super);
+       tree_root = open_ctree(sb);
 
-       if (!root) {
+       if (!tree_root) {
                printk("btrfs: open_ctree failed\n");
                return -EIO;
        }
-       sb->s_fs_info = root;
-       disk_super = root->fs_info->disk_super;
+       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));
 
-       inode = iget_locked(sb, btrfs_super_root_dir(disk_super));
+       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->i_state & I_NEW) {
@@ -527,32 +678,36 @@ static int btrfs_update_inode(struct btrfs_trans_handle *trans,
                              struct inode *inode)
 {
        struct btrfs_inode_item *inode_item;
-       struct btrfs_path path;
+       struct btrfs_path *path;
        int ret;
 
-       btrfs_init_path(&path);
-
-       ret = btrfs_lookup_inode(trans, root, &path, inode->i_ino, 1);
+       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;
        }
 
-       inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),
-                                 path.slots[0],
+       inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
+                                 path->slots[0],
                                  struct btrfs_inode_item);
 
        fill_inode_item(inode_item, inode);
-       mark_buffer_dirty(path.nodes[0]);
+       btrfs_mark_buffer_dirty(path->nodes[0]);
+       ret = 0;
 failed:
-       btrfs_release_path(root, &path);
-       return 0;
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
+       return ret;
 }
 
 static int btrfs_write_inode(struct inode *inode, int wait)
 {
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans;
        int ret;
 
@@ -572,8 +727,8 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
 {
        struct inode *inode;
        struct btrfs_inode_item inode_item;
-       struct btrfs_root *root = btrfs_sb(dir->i_sb);
-       struct btrfs_key key;
+       struct btrfs_root *root = BTRFS_I(dir)->root;
+       struct btrfs_key *location;
        int ret;
        u64 objectid;
 
@@ -581,6 +736,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        if (!inode)
                return ERR_PTR(-ENOMEM);
 
+       BTRFS_I(inode)->root = BTRFS_I(dir)->root;
        ret = btrfs_find_free_objectid(trans, root, dir->i_ino, &objectid);
        BUG_ON(ret);
 
@@ -589,15 +745,13 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        inode->i_mode = mode;
        inode->i_ino = objectid;
        inode->i_blocks = 0;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        fill_inode_item(&inode_item, inode);
-
-       key.objectid = objectid;
-       key.flags = 0;
-       key.offset = 0;
-       btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
-       ret = btrfs_insert_inode_map(trans, root, objectid, &key);
-       BUG_ON(ret);
+       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);
@@ -610,16 +764,22 @@ static int btrfs_add_link(struct btrfs_trans_handle *trans,
                            struct dentry *dentry, struct inode *inode)
 {
        int ret;
-       ret = btrfs_insert_dir_item(trans, btrfs_sb(inode->i_sb),
+       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,
-                                   inode->i_ino, 0);
+                                   &key, 0);
        if (ret == 0) {
-               dentry->d_parent->d_inode->i_size += dentry->d_name.len;
-               ret = btrfs_update_inode(trans, btrfs_sb(inode->i_sb),
+               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;
 }
 
@@ -631,6 +791,8 @@ static int btrfs_add_nondir(struct btrfs_trans_handle *trans,
                d_instantiate(dentry, inode);
                return 0;
        }
+       if (err > 0)
+               err = -EEXIST;
        return err;
 }
 
@@ -638,7 +800,7 @@ 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_sb(dir->i_sb);
+       struct btrfs_root *root = BTRFS_I(dir)->root;
        struct inode *inode;
        int err;
        int drop_inode = 0;
@@ -659,9 +821,10 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
                inode->i_op = &btrfs_file_inode_operations;
        }
        dir->i_sb->s_dirt = 1;
-       btrfs_end_transaction(trans, root);
 out_unlock:
+       btrfs_end_transaction(trans, root);
        mutex_unlock(&root->fs_info->fs_mutex);
+
        if (drop_inode) {
                inode_dec_link_count(inode);
                iput(inode);
@@ -672,21 +835,29 @@ out_unlock:
 static int btrfs_make_empty_dir(struct btrfs_trans_handle *trans,
                                struct inode *inode, struct inode *dir)
 {
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(dir)->root;
        int ret;
        char buf[2];
+       struct btrfs_key key;
+
        buf[0] = '.';
        buf[1] = '.';
 
+       key.objectid = inode->i_ino;
+       key.offset = 0;
+       key.flags = 0;
+       btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
+
        ret = btrfs_insert_dir_item(trans, root, buf, 1, inode->i_ino,
-                                   inode->i_ino, 1);
+                                   &key, 1);
        if (ret)
                goto error;
+       key.objectid = dir->i_ino;
        ret = btrfs_insert_dir_item(trans, root, buf, 2, inode->i_ino,
-                                   dir->i_ino, 1);
+                                   &key, 1);
        if (ret)
                goto error;
-       inode->i_size = 3;
+       inode->i_size = 6;
        ret = btrfs_update_inode(trans, root, inode);
 error:
        return ret;
@@ -696,7 +867,7 @@ static int btrfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 {
        struct inode *inode;
        struct btrfs_trans_handle *trans;
-       struct btrfs_root *root = btrfs_sb(dir->i_sb);
+       struct btrfs_root *root = BTRFS_I(dir)->root;
        int err = 0;
        int drop_on_err = 0;
 
@@ -746,7 +917,6 @@ static int btrfs_sync_fs(struct super_block *sb, int wait)
                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);
@@ -757,6 +927,75 @@ printk("btrfs sync_fs\n");
        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)
 {
@@ -766,38 +1005,38 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
        u64 extent_start = 0;
        u64 extent_end = 0;
        u64 objectid = inode->i_ino;
-       struct btrfs_path path;
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       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;
 
-       btrfs_init_path(&path);
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
+       btrfs_init_path(path);
        if (create)
                trans = btrfs_start_transaction(root, 1);
 
-
-       ret = btrfs_lookup_file_extent(trans, root, &path,
+       ret = btrfs_lookup_file_extent(trans, root, path,
                                       inode->i_ino,
                                       iblock << inode->i_blkbits, 0);
        if (ret < 0) {
-               btrfs_release_path(root, &path);
                err = ret;
                goto out;
        }
 
        if (ret != 0) {
-               if (path.slots[0] == 0) {
-                       btrfs_release_path(root, &path);
+               if (path->slots[0] == 0) {
+                       btrfs_release_path(root, path);
                        goto allocate;
                }
-               path.slots[0]--;
+               path->slots[0]--;
        }
 
-       item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), 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]);
+       leaf = btrfs_buffer_leaf(path->nodes[0]);
        blocknr = btrfs_file_extent_disk_blocknr(item);
        blocknr += btrfs_file_extent_offset(item);
 
@@ -805,25 +1044,23 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
        if (ret == 0) {
                err = 0;
                map_bh(result, inode->i_sb, blocknr);
-               btrfs_release_path(root, &path);
                goto out;
        }
 
        /* are we inside the extent that was found? */
-       found_key = &leaf->items[path.slots[0]].key;
+       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);
+               btrfs_release_path(root, path);
                goto allocate;
        }
 
-       extent_start = btrfs_disk_key_offset(&leaf->items[path.slots[0]].key);
+       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);
-       btrfs_release_path(root, &path);
        if (iblock >= extent_start && iblock < extent_end) {
                err = 0;
                map_bh(result, inode->i_sb, blocknr + iblock - extent_start);
@@ -847,6 +1084,8 @@ allocate:
        map_bh(result, inode->i_sb, blocknr);
 
 out:
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
        if (trans)
                btrfs_end_transaction(trans, root);
        return err;
@@ -856,9 +1095,10 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock,
                           struct buffer_head *result, int create)
 {
        int err;
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       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;
 }
@@ -866,13 +1106,11 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock,
 static int btrfs_prepare_write(struct file *file, struct page *page,
                               unsigned from, unsigned to)
 {
-       WARN_ON(1);
        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)
 {
-       WARN_ON(1);
        return nobh_commit_write(file, page, from, to);
 }
 
@@ -899,7 +1137,7 @@ static int btrfs_writepage(struct page *page, struct writeback_control *wbc)
 
 static void btrfs_truncate(struct inode *inode)
 {
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        int ret;
        struct btrfs_trans_handle *trans;
 
@@ -975,10 +1213,24 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
        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,
+                                     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;
@@ -1022,7 +1274,7 @@ static int prepare_pages(struct btrfs_trans_handle *trans,
                this_write = min(PAGE_CACHE_SIZE - offset, write_bytes);
                ret = nobh_prepare_write(pages[i], offset,
                                         offset + this_write,
-                                        btrfs_get_block_lock);
+                                        btrfs_get_block);
                pos += this_write;
                if (ret) {
                        err = ret;
@@ -1051,9 +1303,8 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
        size_t num_written = 0;
        int err = 0;
        int ret = 0;
-       struct btrfs_trans_handle *trans;
        struct inode *inode = file->f_path.dentry->d_inode;
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct page *pages[1];
 
        if (file->f_flags & O_DIRECT)
@@ -1077,25 +1328,184 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
                size_t write_bytes = min(count, PAGE_CACHE_SIZE - offset);
                size_t num_pages = (write_bytes + PAGE_CACHE_SIZE - 1) >>
                                        PAGE_CACHE_SHIFT;
-               mutex_lock(&root->fs_info->fs_mutex);
-               trans = btrfs_start_transaction(root, 1);
-
-               ret = prepare_pages(trans, root, file, pages, num_pages,
+               ret = prepare_pages(NULL, root, file, pages, num_pages,
                                    pos, write_bytes);
                BUG_ON(ret);
                ret = btrfs_copy_from_user(pos, num_pages,
                                           write_bytes, pages, buf);
                BUG_ON(ret);
 
-               mutex_unlock(&root->fs_info->fs_mutex);
-
-               ret = dirty_and_release_pages(trans, root, file, pages,
+               ret = dirty_and_release_pages(NULL, root, file, pages,
                                              num_pages, pos, write_bytes);
                BUG_ON(ret);
                btrfs_drop_pages(pages, num_pages);
 
-               ret = btrfs_end_transaction(trans, root);
+               buf += write_bytes;
+               count -= write_bytes;
+               pos += write_bytes;
+               num_written += write_bytes;
+
+               balance_dirty_pages_ratelimited(inode->i_mapping);
+               cond_resched();
+       }
+       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)
+{
+       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;
@@ -1104,12 +1514,291 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
                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_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;
+
+       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);
+
+       memset(&new_root_item, 0, sizeof(new_root_item));
+       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, root->node->b_blocknr);
+
+       ret = btrfs_insert_root(trans, root->fs_info->tree_root, &key,
+                               &new_root_item);
+       BUG_ON(ret);
+
+printk("adding snapshot name %.*s root %Lu %Lu %u\n", namelen, name, key.objectid, key.offset, key.flags);
+
+       /*
+        * 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 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;
+       int namelen;
+
+       if (!root->ref_cows)
+               return -EINVAL;
+       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;
+               ret = create_snapshot(root, vol_args.name, namelen);
+               WARN_ON(ret);
+               break;
+       default:
+               return -ENOTTY;
+       }
+       return 0;
+}
+
+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)
@@ -1134,6 +1823,8 @@ static struct super_operations btrfs_super_ops = {
        .write_super    = btrfs_write_super,
        .sync_fs        = btrfs_sync_fs,
        .write_inode    = btrfs_write_inode,
+       .alloc_inode    = btrfs_alloc_inode,
+       .destroy_inode  = btrfs_destroy_inode,
 };
 
 static struct inode_operations btrfs_dir_inode_operations = {
@@ -1144,10 +1835,15 @@ static struct inode_operations btrfs_dir_inode_operations = {
        .rmdir          = btrfs_rmdir,
 };
 
+static struct inode_operations btrfs_dir_ro_inode_operations = {
+       .lookup         = btrfs_lookup,
+};
+
 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 = {
@@ -1166,21 +1862,35 @@ static struct inode_operations btrfs_file_inode_operations = {
 static struct file_operations btrfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read           = do_sync_read,
-       .aio_read       = generic_file_aio_read,
+       .aio_read       = btrfs_file_aio_read,
        .write          = btrfs_file_write,
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
+       .ioctl          = btrfs_ioctl,
 };
 
 static int __init init_btrfs_fs(void)
 {
+       int err;
        printk("btrfs loaded!\n");
+       err = init_inodecache();
+       if (err)
+               return err;
+       kset_set_kset_s(&btrfs_subsys, fs_subsys);
+       err = subsystem_register(&btrfs_subsys);
+       if (err)
+               goto out;
        return register_filesystem(&btrfs_fs_type);
+out:
+       destroy_inodecache();
+       return err;
 }
 
 static void __exit exit_btrfs_fs(void)
 {
+       destroy_inodecache();
        unregister_filesystem(&btrfs_fs_type);
+       subsystem_unregister(&btrfs_subsys);
        printk("btrfs unloaded\n");
 }
 
This page took 0.04768 seconds and 5 git commands to generate.