Btrfs: more inode indexed directory work
[deliverable/linux.git] / fs / btrfs / super.c
index 6969b672b570c36efcd02fc62be539ce0d00f102..d776b29a1676f3099ec2c15272fbea797465cbe6 100644 (file)
@@ -35,25 +35,28 @@ static int check_inode(struct inode *inode)
 
 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);
        int ret;
 
-       btrfs_init_path(&path);
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
+       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);
+       ret = btrfs_lookup_inode(NULL, root, path, inode->i_ino, 0);
        if (ret) {
-               btrfs_release_path(root, &path);
+               btrfs_release_path(root, path);
+               btrfs_free_path(path);
                mutex_unlock(&root->fs_info->fs_mutex);
                make_bad_inode(inode);
                return;
        }
        check_inode(inode);
-       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);
@@ -69,7 +72,11 @@ 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_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) {
@@ -101,15 +108,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;
@@ -117,17 +126,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);
 
-       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;
 }
 
@@ -152,58 +172,58 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry)
        int err;
        int ret;
        struct btrfs_root *root = btrfs_sb(dir->i_sb);
-       struct btrfs_path path;
+       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);
@@ -211,6 +231,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)
@@ -223,33 +245,36 @@ static int btrfs_free_inode(struct btrfs_trans_handle *trans,
                            struct inode *inode)
 {
        u64 objectid = inode->i_ino;
-       struct btrfs_path path;
+       struct btrfs_path *path;
        struct btrfs_inode_map_item *map;
        struct btrfs_key stat_data_key;
        int ret;
+
        clear_inode(inode);
-       btrfs_init_path(&path);
-       ret = btrfs_lookup_inode_map(trans, root, &path, objectid, -1);
+
+       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;
-               btrfs_release_path(root, &path);
                goto error;
        }
-       map = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+       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);
+       ret = btrfs_del_item(trans, root->fs_info->inode_root, path);
        BUG_ON(ret);
-       btrfs_release_path(root, &path);
-       btrfs_init_path(&path);
+       btrfs_release_path(root, path);
 
-       ret = btrfs_lookup_inode(trans, root, &path, objectid, -1);
+       ret = btrfs_lookup_inode(trans, root, path, objectid, -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_release_path(root, path);
+       btrfs_free_path(path);
        return ret;
 }
 
@@ -258,7 +283,7 @@ 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;
@@ -267,34 +292,40 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
        u64 extent_num_blocks = 0;
        int found_extent;
 
+       path = btrfs_alloc_path();
+       BUG_ON(!path);
        /* FIXME, add redo link to tree so we don't leak on crash */
        key.objectid = inode->i_ino;
        key.offset = (u64)-1;
        key.flags = 0;
+       /*
+        * use BTRFS_CSUM_ITEM_KEY because it is larger than inline keys
+        * or extent data
+        */
        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_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;
                if (btrfs_disk_key_type(found_key) == BTRFS_EXTENT_DATA_KEY) {
-                       fi = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),
-                                           path.slots[0],
+                       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 =
@@ -305,18 +336,19 @@ static int btrfs_truncate_in_trans(struct btrfs_trans_handle *trans,
                } else {
                        found_extent = 0;
                }
-               ret = btrfs_del_item(trans, root, &path);
+               ret = btrfs_del_item(trans, root, path);
                BUG_ON(ret);
-               btrfs_release_path(root, &path);
+               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;
 }
 
@@ -351,23 +383,26 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
        const char *name = dentry->d_name.name;
        int namelen = dentry->d_name.len;
        struct btrfs_dir_item *di;
-       struct btrfs_path path;
+       struct btrfs_path *path;
        struct btrfs_root *root = btrfs_sb(dir->i_sb);
        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)) {
+       if (ret || !btrfs_match_dir_item_name(root, path, name, namelen)) {
                *ino = 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);
 out:
-       btrfs_release_path(root, &path);
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
        check_inode(dir);
        return ret;
 }
@@ -405,7 +440,7 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
        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;
@@ -417,36 +452,37 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
        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, BTRFS_DIR_INDEX_KEY);
        key.offset = filp->f_pos;
-       btrfs_init_path(&path);
-       ret = btrfs_search_slot(NULL, root, &key, &path, 0, 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 (btrfs_disk_key_type(&item->key) != BTRFS_DIR_INDEX_KEY)
                        continue;
                if (btrfs_disk_key_offset(&item->key) < filp->f_pos)
                        continue;
@@ -465,7 +501,8 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
        }
        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;
 }
@@ -548,26 +585,29 @@ 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);
+       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, inode->i_ino, 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);
-       btrfs_mark_buffer_dirty(path.nodes[0]);
+       btrfs_mark_buffer_dirty(path->nodes[0]);
 failed:
-       btrfs_release_path(root, &path);
+       btrfs_release_path(root, path);
+       btrfs_free_path(path);
        check_inode(inode);
        return 0;
 }
@@ -641,7 +681,7 @@ static int btrfs_add_link(struct btrfs_trans_handle *trans,
                                    dentry->d_parent->d_inode->i_ino,
                                    inode->i_ino, 0);
        if (ret == 0) {
-               dentry->d_parent->d_inode->i_size += dentry->d_name.len;
+               dentry->d_parent->d_inode->i_size += dentry->d_name.len * 2;
                ret = btrfs_update_inode(trans, btrfs_sb(inode->i_sb),
                                         dentry->d_parent->d_inode);
        }
@@ -719,7 +759,7 @@ static int btrfs_make_empty_dir(struct btrfs_trans_handle *trans,
                                    dir->i_ino, 1);
        if (ret)
                goto error;
-       inode->i_size = 3;
+       inode->i_size = 6;
        ret = btrfs_update_inode(trans, root, inode);
 error:
        return ret;
@@ -775,11 +815,10 @@ static int btrfs_sync_fs(struct super_block *sb, int wait)
 
        sb->s_dirt = 0;
        if (!wait) {
-               // filemap_flush(root->fs_info->btree_inode->i_mapping);
-               filemap_flush(root->fs_info->sb->s_bdev->bd_inode->i_mapping);
+               filemap_flush(root->fs_info->btree_inode->i_mapping);
                return 0;
        }
-       filemap_write_and_wait(root->fs_info->sb->s_bdev->bd_inode->i_mapping);
+       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);
@@ -790,6 +829,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)
 {
@@ -799,38 +907,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_path *path;
        struct btrfs_root *root = btrfs_sb(inode->i_sb);
        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);
 
@@ -838,25 +946,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);
@@ -880,6 +986,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;
@@ -892,6 +1000,7 @@ static int btrfs_get_block(struct inode *inode, sector_t iblock,
        struct btrfs_root *root = btrfs_sb(inode->i_sb);
        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;
 }
@@ -899,13 +1008,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);
 }
 
@@ -1150,6 +1257,174 @@ out:
        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_sb(inode->i_sb);
+       unsigned long page_index;
+
+       if (file->f_flags & O_DIRECT)
+               return -EINVAL;
+       pos = *ppos;
+
+       vfs_check_frozen(inode->i_sb, SB_FREEZE_WRITE);
+       current->backing_dev_info = inode->i_mapping->backing_dev_info;
+       err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
+       if (err)
+               goto out;
+       if (count == 0)
+               goto out;
+       err = remove_suid(file->f_path.dentry);
+       if (err)
+               goto out;
+       file_update_time(file);
+       mutex_lock(&inode->i_mutex);
+       while(count > 0) {
+               size_t offset = pos & (PAGE_CACHE_SIZE - 1);
+               size_t write_bytes = min(count, PAGE_CACHE_SIZE - offset);
+               struct page *page;
+
+               page_index = pos >> PAGE_CACHE_SHIFT;
+               page = grab_cache_page(inode->i_mapping, page_index);
+               if (!PageUptodate(page)) {
+                       ret = mpage_readpage(page, btrfs_get_block);
+                       BUG_ON(ret);
+                       lock_page(page);
+               }
+               ret = btrfs_copy_from_user(pos, 1,
+                                          write_bytes, &page, buf);
+               BUG_ON(ret);
+               write_bytes = inline_one_page(root, inode, page, pos,
+                                     offset, write_bytes);
+               SetPageUptodate(page);
+               if (write_bytes > 0 && pos + write_bytes > inode->i_size) {
+                       i_size_write(inode, pos + write_bytes);
+                       mark_inode_dirty(inode);
+               }
+               page_cache_release(page);
+               unlock_page(page);
+               if (write_bytes < 0)
+                       goto out_unlock;
+               buf += write_bytes;
+               count -= write_bytes;
+               pos += write_bytes;
+               num_written += write_bytes;
+
+               balance_dirty_pages_ratelimited(inode->i_mapping);
+               cond_resched();
+       }
+out_unlock:
+       mutex_unlock(&inode->i_mutex);
+out:
+       *ppos = pos;
+       current->backing_dev_info = NULL;
+       return num_written ? num_written : err;
+}
+#endif
+
 static int btrfs_read_actor(read_descriptor_t *desc, struct page *page,
                        unsigned long offset, unsigned long size)
 {
@@ -1289,7 +1564,6 @@ static void btrfs_destroy_inode(struct inode *inode)
        WARN_ON(ei->magic != 0xDEADBEEF);
        WARN_ON(ei->magic2 != 0xDEADBEAF);
        WARN_ON(!list_empty(&inode->i_dentry));
-       WARN_ON(inode->i_ino == 1);
        WARN_ON(inode->i_data.nrpages);
 
        ei->magic = 0;
This page took 0.036937 seconds and 5 git commands to generate.