csum data struct changes

[platform/upstream/btrfs-progs.git] / dir-test.c

diff --git a/dir-test.c b/dir-test.c
index 56f06c3..6117d22 100644 (file)
--- a/dir-test.c
+++ b/dir-test.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include "kerncompat.h"
 #include "radix-tree.h"
@@ -12,7 +14,7 @@
 
 int keep_running = 1;
 struct btrfs_super_block super;
-static u64 dir_oid = 44556;
+static u64 dir_oid = 0;
 static u64 file_oid = 33778;
 
 static int find_num(struct radix_tree_root *root, unsigned long *num_ret,
@@ -39,6 +41,14 @@ 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);
+       btrfs_set_inode_mode(inode_item, S_IFREG | 0700);
+}
+
 static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                   struct radix_tree_root *radix)
 {
@@ -48,6 +58,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);
@@ -63,6 +74,11 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        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,
                                    objectid, 1);
        if (ret)
@@ -143,7 +159,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 +168,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 +200,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 +227,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 +337,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;
        }
@@ -404,15 +428,15 @@ int main(int ac, char **av)
        struct btrfs_trans_handle *trans;
        radix_tree_init();
 
-       printf("removing old tree\n");
-       unlink("dbfile");
-       root = open_ctree("dbfile", &super);
+       root = open_ctree(av[ac-1], &super);
        trans = btrfs_start_transaction(root, 1);
 
+       dir_oid = btrfs_super_root_dir(&super);
+
        signal(SIGTERM, sigstopper);
        signal(SIGINT, sigstopper);
 
-       for (i = 1 ; i < ac ; i++) {
+       for (i = 1 ; i < ac - 1; i++) {
                if (strcmp(av[i], "-i") == 0) {
                        initial_only = 1;
                } else if (strcmp(av[i], "-c") == 0) {