32bit cleanups

diff --git a/print-tree.c b/print-tree.c
index 1d59127..a9a1422 100644 (file)
--- a/print-tree.c
+++ b/print-tree.c
@@ -43,7 +43,7 @@ void print_tree(struct ctree_root *root, struct tree_buffer *t)
                print_leaf((struct leaf *)c);
                return;
        }
-       printf("node %Lu level %d total ptrs %d free spc %lu\n", t->blocknr,
+       printf("node %Lu level %d total ptrs %d free spc %u\n", t->blocknr,
                node_level(c->header.flags), c->header.nritems,
                NODEPTRS_PER_BLOCK - c->header.nritems);
        fflush(stdout);

diff --git a/random-test.c b/random-test.c
index 111a248..7078263 100644 (file)
--- a/random-test.c
+++ b/random-test.c
@@ -40,15 +40,16 @@ static int ins_one(struct ctree_root *root, struct radix_tree_root *radix)
        struct key key;
        int ret;
        char buf[128];
+       unsigned long oid;
        init_path(&path);
        ret = setup_key(radix, &key, 0);
        sprintf(buf, "str-%Lu\n", key.objectid);
        ret = insert_item(root, &key, buf, strlen(buf));
        if (ret)
                goto error;
+       oid = (unsigned long)key.objectid;
        radix_tree_preload(GFP_KERNEL);
-       ret = radix_tree_insert(radix, key.objectid,
-                                       (void *)key.objectid);
+       ret = radix_tree_insert(radix, oid, (void *)oid);
        radix_tree_preload_end();
        if (ret)
                goto error;