diff --git a/[refs] b/[refs]
index 200bf13b268a..54445554d99a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cf75962acd27ed0f819df791486e7b803c7109c
+refs/heads/master: 41903fe666ff8e7b1d47ac7b2f5f9a91c7749498
diff --git a/trunk/fs/btrfs/print-tree.c b/trunk/fs/btrfs/print-tree.c
index 1d591270f4c4..a9a14223e186 100644
--- a/trunk/fs/btrfs/print-tree.c
+++ b/trunk/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/trunk/fs/btrfs/random-test.c b/trunk/fs/btrfs/random-test.c
index 111a248bd5c2..7078263acc3d 100644
--- a/trunk/fs/btrfs/random-test.c
+++ b/trunk/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;