Btrfs: drop the inode map tree
[deliverable/linux.git] / fs / btrfs / super.c
index 822243650ae9d41f713b48b009eb63dc6a37e9a9..3e8bfb0e5d7e8253d67814c86b45af35177693a9 100644 (file)
 #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;
 static struct address_space_operations btrfs_aops;
 static struct file_operations btrfs_file_operations;
 
-static int check_inode(struct inode *inode)
-{
-       struct btrfs_inode *ei = BTRFS_I(inode);
-       WARN_ON(ei->magic != 0xDEADBEEF);
-       WARN_ON(ei->magic2 != 0xDEADBEAF);
-       return 0;
-}
-
 static void btrfs_read_locked_inode(struct inode *inode)
 {
        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;
 
        path = btrfs_alloc_path();
@@ -45,16 +58,12 @@ static void btrfs_read_locked_inode(struct inode *inode)
        btrfs_init_path(path);
        mutex_lock(&root->fs_info->fs_mutex);
 
-       check_inode(inode);
-       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);
                btrfs_free_path(path);
-               mutex_unlock(&root->fs_info->fs_mutex);
-               make_bad_inode(inode);
-               return;
+               goto make_bad;
        }
-       check_inode(inode);
        inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
                                  path->slots[0],
                                  struct btrfs_inode_item);
@@ -73,12 +82,11 @@ static void btrfs_read_locked_inode(struct inode *inode)
        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);
-       check_inode(inode);
+
        switch (inode->i_mode & S_IFMT) {
 #if 0
        default:
@@ -92,15 +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;
        }
-       check_inode(inode);
        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,
@@ -128,8 +144,15 @@ static int btrfs_unlink_trans(struct btrfs_trans_handle *trans,
        }
        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);
+       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;
@@ -138,7 +161,7 @@ err:
        btrfs_free_path(path);
        if (ret == 0) {
                inode_dec_link_count(dentry->d_inode);
-               dir->i_size -= name_len;
+               dir->i_size -= name_len * 2;
                mark_inode_dirty(dir);
        }
        return ret;
@@ -150,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);
@@ -164,12 +187,14 @@ 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_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 = "..";
 
        path = btrfs_alloc_path();
        BUG_ON(!path);
@@ -178,46 +203,42 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
        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);
        }
+       ret = 0;
        btrfs_release_path(root, path);
 
        /* now the directory is empty */
@@ -239,10 +260,7 @@ 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;
        int ret;
 
        clear_inode(inode);
@@ -250,25 +268,11 @@ static int btrfs_free_inode(struct btrfs_trans_handle *trans,
        path = btrfs_alloc_path();
        BUG_ON(!path);
        btrfs_init_path(path);
-       ret = btrfs_lookup_inode_map(trans, root, path, objectid, -1);
-       if (ret) {
-               if (ret > 0)
-                       ret = -ENOENT;
-               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);
-
-       ret = btrfs_lookup_inode(trans, root, path, objectid, -1);
+       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);
-error:
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        return ret;
 }
@@ -350,7 +354,7 @@ error:
 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);
@@ -373,13 +377,13 @@ 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_root *root = BTRFS_I(dir)->root;
        int ret;
 
        path = btrfs_alloc_path();
@@ -388,50 +392,131 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
        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;
+               location->objectid = 0;
                ret = 0;
                goto out;
        }
        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_free_path(path);
-       check_inode(dir);
        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;
-       struct btrfs_root *root = btrfs_sb(dir->i_sb);
-       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);
        mutex_lock(&root->fs_info->fs_mutex);
-       ret = btrfs_inode_by_name(dir, dentry, &ino);
+       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);
-               check_inode(inode);
+               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);
+               }
        }
-       check_inode(dir);
        return d_splice_alias(inode, 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;
@@ -443,18 +528,21 @@ 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;
        path = btrfs_alloc_path();
        btrfs_init_path(path);
        ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
-       if (ret < 0) {
+       if (ret < 0)
                goto err;
-       }
        advance = 0;
        while(1) {
                leaf = btrfs_buffer_leaf(path->nodes[0]);
@@ -477,23 +565,25 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
                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);
@@ -519,26 +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 btrfs_root *root;
+       struct btrfs_root *tree_root;
+       struct btrfs_inode *bi;
 
        sb->s_maxbytes = MAX_LFS_FILESIZE;
        sb->s_magic = BTRFS_SUPER_MAGIC;
        sb->s_op = &btrfs_super_ops;
        sb->s_time_gran = 1;
 
-       root = open_ctree(sb);
+       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) {
@@ -572,7 +671,6 @@ static void fill_inode_item(struct btrfs_inode_item *item,
        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);
-       check_inode(inode);
 }
 
 static int btrfs_update_inode(struct btrfs_trans_handle *trans,
@@ -586,8 +684,8 @@ static int btrfs_update_inode(struct btrfs_trans_handle *trans,
        path = btrfs_alloc_path();
        BUG_ON(!path);
        btrfs_init_path(path);
-
-       ret = btrfs_lookup_inode(trans, root, path, inode->i_ino, 1);
+       ret = btrfs_lookup_inode(trans, root, path,
+                                &BTRFS_I(inode)->location, 1);
        if (ret) {
                if (ret > 0)
                        ret = -ENOENT;
@@ -600,16 +698,16 @@ static int btrfs_update_inode(struct btrfs_trans_handle *trans,
 
        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);
-       check_inode(inode);
-       return 0;
+       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;
 
@@ -621,7 +719,6 @@ static int btrfs_write_inode(struct inode *inode, int wait)
        else
                btrfs_end_transaction(trans, root);
        mutex_unlock(&root->fs_info->fs_mutex);
-       check_inode(inode);
        return ret;
 }
 
@@ -630,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;
 
@@ -639,7 +736,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
        if (!inode)
                return ERR_PTR(-ENOMEM);
 
-       check_inode(inode);
+       BTRFS_I(inode)->root = BTRFS_I(dir)->root;
        ret = btrfs_find_free_objectid(trans, root, dir->i_ino, &objectid);
        BUG_ON(ret);
 
@@ -648,22 +745,18 @@ 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);
 
        insert_inode_hash(inode);
-       check_inode(inode);
-       check_inode(dir);
        return inode;
 }
 
@@ -671,17 +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);
        }
-       check_inode(inode);
-       check_inode(dentry->d_parent->d_inode);
        return ret;
 }
 
@@ -695,7 +793,6 @@ static int btrfs_add_nondir(struct btrfs_trans_handle *trans,
        }
        if (err > 0)
                err = -EEXIST;
-       check_inode(inode);
        return err;
 }
 
@@ -703,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;
@@ -727,8 +824,6 @@ static int btrfs_create(struct inode *dir, struct dentry *dentry,
 out_unlock:
        btrfs_end_transaction(trans, root);
        mutex_unlock(&root->fs_info->fs_mutex);
-       check_inode(inode);
-       check_inode(dir);
 
        if (drop_inode) {
                inode_dec_link_count(inode);
@@ -740,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;
@@ -764,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;
 
@@ -903,7 +1006,7 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
        u64 extent_end = 0;
        u64 objectid = inode->i_ino;
        struct btrfs_path *path;
-       struct btrfs_root *root = btrfs_sb(inode->i_sb);
+       struct btrfs_root *root = BTRFS_I(inode)->root;
        struct btrfs_trans_handle *trans = NULL;
        struct btrfs_file_extent_item *item;
        struct btrfs_leaf *leaf;
@@ -915,7 +1018,6 @@ static int btrfs_get_block_lock(struct inode *inode, sector_t iblock,
        if (create)
                trans = btrfs_start_transaction(root, 1);
 
-
        ret = btrfs_lookup_file_extent(trans, root, path,
                                       inode->i_ino,
                                       iblock << inode->i_blkbits, 0);
@@ -993,7 +1095,7 @@ 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);
@@ -1035,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;
 
@@ -1202,7 +1304,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
        int err = 0;
        int ret = 0;
        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)
@@ -1359,7 +1461,7 @@ static ssize_t btrfs_file_inline_write(struct file *file,
        int err = 0;
        int ret = 0;
        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;
        unsigned long page_index;
 
        if (file->f_flags & O_DIRECT)
@@ -1426,13 +1528,14 @@ static int btrfs_read_actor(read_descriptor_t *desc, struct page *page,
 {
        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_sb(page->mapping->host->i_sb);
+               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,
@@ -1533,6 +1636,89 @@ static ssize_t btrfs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
        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;
@@ -1549,21 +1735,14 @@ static struct inode *btrfs_alloc_inode(struct super_block *sb)
        ei = kmem_cache_alloc(btrfs_inode_cachep, GFP_NOFS);
        if (!ei)
                return NULL;
-       ei->magic = 0xDEADBEEF;
-       ei->magic2 = 0xDEADBEAF;
        return &ei->vfs_inode;
 }
 
 static void btrfs_destroy_inode(struct inode *inode)
 {
-       struct btrfs_inode *ei = BTRFS_I(inode);
-       WARN_ON(ei->magic != 0xDEADBEEF);
-       WARN_ON(ei->magic2 != 0xDEADBEAF);
        WARN_ON(!list_empty(&inode->i_dentry));
        WARN_ON(inode->i_data.nrpages);
 
-       ei->magic = 0;
-       ei->magic2 = 0;
        kmem_cache_free(btrfs_inode_cachep, BTRFS_I(inode));
 }
 
@@ -1656,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 = {
@@ -1682,6 +1866,7 @@ static struct file_operations btrfs_file_operations = {
        .write          = btrfs_file_write,
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
+       .ioctl          = btrfs_ioctl,
 };
 
 static int __init init_btrfs_fs(void)
@@ -1691,13 +1876,21 @@ static int __init init_btrfs_fs(void)
        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.047356 seconds and 5 git commands to generate.