Btrfs: 32bit cleanups

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

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 1d591270f4c4bfcdbf7ad9b5b2408e834c5029ca..a9a14223e1869f5f8065ae03cd64f2f8d6521fd6 100644 (file)
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/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/fs/btrfs/random-test.c b/fs/btrfs/random-test.c
index 111a248bd5c29c9b0ea481e2a147d9fb1b44d25b..7078263acc3dfc6a83eed6ee4620e975aa958455 100644 (file)
--- a/fs/btrfs/random-test.c
+++ b/fs/btrfs/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;