Btrfs: change dir-test to insert inode_items

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 68e3da274f176b5aae8df767aad6f23c1387d251..b30b2ce724550ccd0d633c8c4d6e06060e50f278 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -219,6 +219,7 @@ struct btrfs_fs_info {
        struct list_head cache;
        u64 last_inode_alloc;
        u64 last_inode_alloc_dirid;
+       u64 generation;
        int cache_size;
        int fp;
        struct btrfs_trans_handle *running_transaction;
@@ -802,4 +803,9 @@ int btrfs_insert_inode_map(struct btrfs_trans_handle *trans,
 int btrfs_lookup_inode_map(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root, struct btrfs_path *path,
                           u64 objectid, int mod);
+int btrfs_insert_inode(struct btrfs_trans_handle *trans, struct btrfs_root
+                      *root, u64 objectid, struct btrfs_inode_item
+                      *inode_item);
+int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root
+                      *root, struct btrfs_path *path, u64 objectid, int mod);
 #endif

diff --git a/fs/btrfs/dir-test.c b/fs/btrfs/dir-test.c
index 56f06c3ba5733fb421680bc85bac31b0e1852427..8fc77c83a35128522df73eb9e9edb2ebf1285171 100644 (file)
--- a/fs/btrfs/dir-test.c
+++ b/fs/btrfs/dir-test.c
@@ -39,6 +39,13 @@ again:
        return 0;
 }
 
+static void initial_inode_init(struct btrfs_root *root,
+                              struct btrfs_inode_item *inode_item)
+{
+       memset(inode_item, 0, sizeof(*inode_item));
+       btrfs_set_inode_generation(inode_item, root->fs_info->generation);
+}
+
 static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                   struct radix_tree_root *radix)
 {
@@ -48,6 +55,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        u64 objectid;
        struct btrfs_path path;
        struct btrfs_key inode_map;
+       struct btrfs_inode_item inode_item;
 
        find_num(radix, &oid, 0);
        sprintf(buf, "str-%lu", oid);
@@ -61,6 +69,11 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        inode_map.offset = 0;
 
        ret = btrfs_insert_inode_map(trans, root, objectid, &inode_map);
+       if (ret)
+               goto error;
+
+       initial_inode_init(root, &inode_item);
+       ret = btrfs_insert_inode(trans, root, objectid, &inode_item);
        if (ret)
                goto error;
        ret = btrfs_insert_dir_item(trans, root, buf, strlen(buf), dir_oid,
@@ -143,7 +156,6 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
        unsigned long *ptr;
        u64 file_objectid;
        struct btrfs_dir_item *di;
-       struct btrfs_path map_path;
 
        /* find the inode number of the file */
        di = btrfs_item_ptr(&path->nodes[0]->leaf, path->slots[0],
@@ -153,20 +165,31 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
        /* delete the directory item */
        ret = btrfs_del_item(trans, root, path);
        if (ret)
-               goto out;
+               goto out_release;
+       btrfs_release_path(root, path);
+
+       /* delete the inode */
+       btrfs_init_path(path);
+       ret = btrfs_lookup_inode(trans, root, path, file_objectid, -1);
+       if (ret)
+               goto out_release;
+       ret = btrfs_del_item(trans, root, path);
+       if (ret)
+               goto out_release;
+       btrfs_release_path(root, path);
 
        /* delete the inode mapping */
-       btrfs_init_path(&map_path);
-       ret = btrfs_lookup_inode_map(trans, root, &map_path, file_objectid, -1);
+       btrfs_init_path(path);
+       ret = btrfs_lookup_inode_map(trans, root, path, file_objectid, -1);
        if (ret)
                goto out_release;
-       ret = btrfs_del_item(trans, root->fs_info->inode_root, &map_path);
+       ret = btrfs_del_item(trans, root->fs_info->inode_root, path);
        if (ret)
                goto out_release;
 
        if (root->fs_info->last_inode_alloc > file_objectid)
                root->fs_info->last_inode_alloc = file_objectid;
-       btrfs_release_path(root, &map_path);
+       btrfs_release_path(root, path);
        ptr = radix_tree_delete(radix, radix_index);
        if (!ptr) {
                ret = -5555;
@@ -174,7 +197,7 @@ static int del_dir_item(struct btrfs_trans_handle *trans,
        }
        return 0;
 out_release:
-       btrfs_release_path(root, &map_path);
+       btrfs_release_path(root, path);
 out:
        printf("failed to delete %lu %d\n", radix_index, ret);
        return -1;
@@ -201,7 +224,6 @@ static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        ret = del_dir_item(trans, root, radix, oid, &path);
        if (ret)
                goto out_release;
-       btrfs_release_path(root, &path);
        return ret;
 out_release:
        btrfs_release_path(root, &path);
@@ -312,7 +334,6 @@ static int empty_tree(struct btrfs_trans_handle *trans, struct btrfs_root
                                found);
                        return -1;
                }
-               btrfs_release_path(root, &path);
                if (!keep_running)
                        break;
        }

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1849a99690c82eb614c6819e6d1dd8da3eb9f4bd..bacaa38ea82efe977e2ce08e8f984683c168d09f 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -226,6 +226,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, struct
 
        ret = btrfs_del_root(trans, root->fs_info->tree_root, &snap_key);
        BUG_ON(ret);
+       root->fs_info->generation = root->root_key.offset + 1;
 
        return ret;
 }
@@ -328,6 +329,7 @@ struct btrfs_root *open_ctree(char *filename, struct btrfs_super_block *super)
        root->commit_root = root->node;
        root->node->count++;
        root->ref_cows = 1;
+       root->fs_info->generation = root->root_key.offset + 1;
        return root;
 }
 

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index f250e5fad773a1bff8e0a07b178ce49b165247c9..f53b99da12f3dc9c01cf2285aedfe56b58473520 100644 (file)
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -14,6 +14,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
        struct btrfs_root_item *ri;
        struct btrfs_dir_item *di;
        struct btrfs_inode_map_item *mi;
+       struct btrfs_inode_item *ii;
        u32 type;
 
        printf("leaf %Lu total ptrs %d free space %d\n",
@@ -32,6 +33,10 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
                        btrfs_item_size(item));
                switch (type) {
                case BTRFS_INODE_ITEM_KEY:
+                       ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
+                       printf("\t\tinode generation %Lu size %Lu\n",
+                              btrfs_inode_generation(ii),
+                              btrfs_inode_size(ii));
                        break;
                case BTRFS_DIR_ITEM_KEY:
                        di = btrfs_item_ptr(l, i, struct btrfs_dir_item);