aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-02-26 10:55:42 -0500
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-02-26 10:55:42 -0500
commit41903fe666ff8e7b1d47ac7b2f5f9a91c7749498 (patch)
tree9d82f4d5c41cfac22a507f7e76530ebbff785043
parent7cf75962acd27ed0f819df791486e7b803c7109c (diff)
Btrfs: 32bit cleanups
Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/btrfs/print-tree.c2
-rw-r--r--fs/btrfs/random-test.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 1d591270f4c..a9a14223e18 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 111a248bd5c..7078263acc3 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;