2 files changed, 4 insertions, 3 deletions

diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 1d591270f4c4..a9a14223e186 100644
--- 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 111a248bd5c2..7078263acc3d 100644
--- 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;