RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-10 19:21:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

printf cleanups

Browse Source
This commit is contained in:
Chris Mason 2007-06-12 08:08:04 -04:00 committed by David Woodhouse
parent b53a236c3e
commit 38ef945266
8 changed files with 84 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
btrfsck.c
View File

@ -57,13 +57,13 @@ static int check_leaf(struct btrfs_root *root,
u32 nritems = btrfs_header_nritems(&leaf->header); u32 nritems = btrfs_header_nritems(&leaf->header);
if (btrfs_header_level(&leaf->header) != 0) { if (btrfs_header_level(&leaf->header) != 0) {
fprintf(stderr, "leaf is not a leaf %Lu\n", fprintf(stderr, "leaf is not a leaf %llu\n",
btrfs_header_blocknr(&leaf->header)); (unsigned long long)btrfs_header_blocknr(&leaf->header));
return 1; return 1;
} }
if (btrfs_leaf_free_space(root, leaf) < 0) { if (btrfs_leaf_free_space(root, leaf) < 0) {
fprintf(stderr, "leaf free space incorrect %Lu %d\n", fprintf(stderr, "leaf free space incorrect %llu %d\n",
btrfs_header_blocknr(&leaf->header), (unsigned long long)btrfs_header_blocknr(&leaf->header),
btrfs_leaf_free_space(root, leaf)); btrfs_leaf_free_space(root, leaf));
return 1; return 1;
} }
@ -71,13 +71,11 @@ static int check_leaf(struct btrfs_root *root,
if (nritems == 0) if (nritems == 0)
return 0; return 0;
if (parent_key->flags) { if (parent_key->flags && memcmp(parent_key, &leaf->items[0].key,
if (memcmp(parent_key, &leaf->items[0].key, sizeof(struct btrfs_disk_key))) {
sizeof(struct btrfs_disk_key))) { fprintf(stderr, "leaf parent key incorrect %llu\n",
fprintf(stderr, "leaf parent key incorrect %Lu\n", (unsigned long long)btrfs_header_blocknr(&leaf->header));
btrfs_header_blocknr(&leaf->header)); return 1;
return 1;
}
} }
for (i = 0; nritems > 1 && i < nritems - 2; i++) { for (i = 0; nritems > 1 && i < nritems - 2; i++) {
struct btrfs_key cpukey; struct btrfs_key cpukey;
@ -142,13 +140,14 @@ static int add_extent_rec(struct radix_tree_root *extent_radix,
if (inc_ref) if (inc_ref)
rec->refs++; rec->refs++;
if (start != rec->start) { if (start != rec->start) {
fprintf(stderr, "warning, start mismatch %Lu %Lu\n", fprintf(stderr, "warning, start mismatch %llu %llu\n",
rec->start, start); (unsigned long long)rec->start,
(unsigned long long)start);
ret = 1; ret = 1;
} }
if (extent_item_refs) { if (extent_item_refs) {
if (rec->extent_item_refs) { if (rec->extent_item_refs) {
fprintf(stderr, "block %Lu rec extent_item_refs %u, passed %u\n", start, rec->extent_item_refs, extent_item_refs); fprintf(stderr, "block %llu rec extent_item_refs %u, passed %u\n", (unsigned long long)start, rec->extent_item_refs, extent_item_refs);
} }
rec->extent_item_refs = extent_item_refs; rec->extent_item_refs = extent_item_refs;
} }
@ -282,7 +281,8 @@ static int run_next_block(struct btrfs_root *root,
nritems = btrfs_header_nritems(&buf->node.header); nritems = btrfs_header_nritems(&buf->node.header);
ret = check_block(root, extent_radix, buf); ret = check_block(root, extent_radix, buf);
if (ret) { if (ret) {
fprintf(stderr, "bad block %Lu\n", blocknr); fprintf(stderr, "bad block %llu\n",
(unsigned long long)blocknr);
} }
if (btrfs_is_leaf(&buf->node)) { if (btrfs_is_leaf(&buf->node)) {
leaf = &buf->leaf; leaf = &buf->leaf;
@ -401,8 +401,9 @@ int check_extent_refs(struct btrfs_root *root,
break; break;
for (i = 0; i < ret; i++) { for (i = 0; i < ret; i++) {
if (rec[i]->refs != rec[i]->extent_item_refs) { if (rec[i]->refs != rec[i]->extent_item_refs) {
fprintf(stderr, "ref mismatch on [%Lu %Lu] ", fprintf(stderr, "ref mismatch on [%llu %llu] ",
rec[i]->start, rec[i]->nr); (unsigned long long)rec[i]->start,
(unsigned long long)rec[i]->nr);
fprintf(stderr, "extent item %u, found %u\n", fprintf(stderr, "extent item %u, found %u\n",
rec[i]->extent_item_refs, rec[i]->extent_item_refs,
rec[i]->refs); rec[i]->refs);
@ -496,9 +497,12 @@ int main(int ac, char **av) {
} }
ret = check_extent_refs(root, &extent_radix); ret = check_extent_refs(root, &extent_radix);
close_ctree(root, &super); close_ctree(root, &super);
printf("found %Lu blocks used err is %d\n", blocks_used, ret); printf("found %llu blocks used err is %d\n",
printf("total csum bytes: %Lu\n", total_csum_bytes); (unsigned long long)blocks_used, ret);
printf("total tree blocks: %Lu\n", total_btree_blocks); printf("total csum bytes: %llu\n",(unsigned long long)total_csum_bytes);
printf("btree space waste bytes: %Lu\n", btree_space_waste); printf("total tree blocks: %llu\n",
(unsigned long long)total_btree_blocks);
printf("btree space waste bytes: %llu\n",
(unsigned long long)btree_space_waste);
return ret; return ret;
} }

1
btrfsctl.c
View File

@ -58,7 +58,6 @@ int main(int ac, char **av)
exit(1); exit(1);
} }
fname = av[ac - 1]; fname = av[ac - 1];
printf("fname is %s\n", fname);
ret = stat(fname, &st); ret = stat(fname, &st);
if (ret < 0) { if (ret < 0) {
perror("stat:"); perror("stat:");

12
debug-tree.c
View File

@ -67,15 +67,19 @@ int main(int ac, char **av) {
printf("extent tree "); printf("extent tree ");
break; break;
} }
printf("tree %Lu %Lu %u\n", found_key.objectid, printf("tree %llu %u %llu\n",
found_key.offset, found_key.flags); (unsigned long long)found_key.objectid,
found_key.flags,
(unsigned long long)found_key.offset);
btrfs_print_tree(root, buf); btrfs_print_tree(root, buf);
} }
path.slots[0]++; path.slots[0]++;
} }
btrfs_release_path(root, &path); btrfs_release_path(root, &path);
printf("total blocks %Lu\n", btrfs_super_total_blocks(&super)); printf("total blocks %llu\n",
printf("blocks used %Lu\n", btrfs_super_blocks_used(&super)); (unsigned long long)btrfs_super_total_blocks(&super));
printf("blocks used %llu\n",
(unsigned long long)btrfs_super_blocks_used(&super));
uuidbuf[36] = '\0'; uuidbuf[36] = '\0';
uuid_unparse(super.fsid, uuidbuf); uuid_unparse(super.fsid, uuidbuf);
printf("uuid %s\n", uuidbuf); printf("uuid %s\n", uuidbuf);

4
extent-tree.c
View File

@ -285,9 +285,9 @@ static int __free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_init_path(&path); btrfs_init_path(&path);
ret = btrfs_search_slot(trans, extent_root, &key, &path, -1, 1); ret = btrfs_search_slot(trans, extent_root, &key, &path, -1, 1);
if (ret) { if (ret) {
printf("failed to find %Lu\n", key.objectid);
btrfs_print_tree(extent_root, extent_root->node); btrfs_print_tree(extent_root, extent_root->node);
printf("failed to find %Lu\n", key.objectid); printf("failed to find %llu\n",
(unsigned long long)key.objectid);
BUG(); BUG();
} }
ei = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0], ei = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0],

2
hasher.c
View File

@ -19,7 +19,7 @@ int main() {
line[strlen(line)-1] = '\0'; line[strlen(line)-1] = '\0';
ret = btrfs_name_hash(line, strlen(line), &result); ret = btrfs_name_hash(line, strlen(line), &result);
BUG_ON(ret); BUG_ON(ret);
printf("hash returns %Lu\n", result); printf("hash returns %llu\n", (unsigned long long)result);
} }
return 0; return 0;
} }

4
mkfs.c
View File

@ -369,8 +369,8 @@ int main(int ac, char **av)
fprintf(stderr, "failed to setup the root directory\n"); fprintf(stderr, "failed to setup the root directory\n");
exit(1); exit(1);
} }
printf("fs created on %s blocksize %d blocks %Lu\n", printf("fs created on %s blocksize %d blocks %llu\n",
file, 4096, block_count); file, 4096, (unsigned long long)block_count);
return 0; return 0;
} }

73
print-tree.c
View File

@ -13,10 +13,10 @@ static int print_dir_item(struct btrfs_item *item,
u32 len; u32 len;
total = btrfs_item_size(item); total = btrfs_item_size(item);
while(cur < total) { while(cur < total) {
printf("\t\tdir index %Lu flags %u type %u\n", printf("\t\tdir index %llu flags %u type %u\n",
btrfs_disk_key_objectid(&di->location), (unsigned long long)btrfs_disk_key_objectid(&di->location),
btrfs_dir_flags(di), btrfs_dir_flags(di),
btrfs_dir_type(di)); btrfs_dir_type(di));
printf("\t\tname %.*s\n", printf("\t\tname %.*s\n",
btrfs_dir_name_len(di),(char *)(di + 1)); btrfs_dir_name_len(di),(char *)(di + 1));
len = sizeof(*di) + btrfs_dir_name_len(di); len = sizeof(*di) + btrfs_dir_name_len(di);
@ -39,29 +39,29 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
struct btrfs_block_group_item *bi; struct btrfs_block_group_item *bi;
u32 type; u32 type;
printf("leaf %Lu ptrs %d free space %d generation %Lu owner %Lu\n", printf("leaf %llu ptrs %d free space %d generation %llu owner %llu\n",
btrfs_header_blocknr(&l->header), nr, (unsigned long long)btrfs_header_blocknr(&l->header), nr,
btrfs_leaf_free_space(root, l), btrfs_leaf_free_space(root, l),
btrfs_header_generation(&l->header), (unsigned long long)btrfs_header_generation(&l->header),
btrfs_header_owner(&l->header)); (unsigned long long)btrfs_header_owner(&l->header));
fflush(stdout); fflush(stdout);
for (i = 0 ; i < nr ; i++) { for (i = 0 ; i < nr ; i++) {
item = l->items + i; item = l->items + i;
type = btrfs_disk_key_type(&item->key); type = btrfs_disk_key_type(&item->key);
printf("\titem %d key (%Lu %x %Lu) itemoff %d itemsize %d\n", printf("\titem %d key (%llu %x %llu) itemoff %d itemsize %d\n",
i, i,
btrfs_disk_key_objectid(&item->key), (unsigned long long)btrfs_disk_key_objectid(&item->key),
btrfs_disk_key_flags(&item->key), btrfs_disk_key_flags(&item->key),
btrfs_disk_key_offset(&item->key), (unsigned long long)btrfs_disk_key_offset(&item->key),
btrfs_item_offset(item), btrfs_item_offset(item),
btrfs_item_size(item)); btrfs_item_size(item));
switch (type) { switch (type) {
case BTRFS_INODE_ITEM_KEY: case BTRFS_INODE_ITEM_KEY:
ii = btrfs_item_ptr(l, i, struct btrfs_inode_item); ii = btrfs_item_ptr(l, i, struct btrfs_inode_item);
printf("\t\tinode generation %Lu size %Lu block group %Lu mode %o\n", printf("\t\tinode generation %llu size %llu block group %llu mode %o\n",
btrfs_inode_generation(ii), (unsigned long long)btrfs_inode_generation(ii),
btrfs_inode_size(ii), (unsigned long long)btrfs_inode_size(ii),
btrfs_inode_block_group(ii), (unsigned long long)btrfs_inode_block_group(ii),
btrfs_inode_mode(ii)); btrfs_inode_mode(ii));
break; break;
case BTRFS_DIR_ITEM_KEY: case BTRFS_DIR_ITEM_KEY:
@ -74,16 +74,16 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
break; break;
case BTRFS_ROOT_ITEM_KEY: case BTRFS_ROOT_ITEM_KEY:
ri = btrfs_item_ptr(l, i, struct btrfs_root_item); ri = btrfs_item_ptr(l, i, struct btrfs_root_item);
printf("\t\troot data blocknr %Lu dirid %Lu refs %u\n", printf("\t\troot data blocknr %llu dirid %llu refs %u\n",
btrfs_root_blocknr(ri), (unsigned long long)btrfs_root_blocknr(ri),
btrfs_root_dirid(ri), (unsigned long long)btrfs_root_dirid(ri),
btrfs_root_refs(ri)); btrfs_root_refs(ri));
break; break;
case BTRFS_EXTENT_ITEM_KEY: case BTRFS_EXTENT_ITEM_KEY:
ei = btrfs_item_ptr(l, i, struct btrfs_extent_item); ei = btrfs_item_ptr(l, i, struct btrfs_extent_item);
printf("\t\textent data refs %u owner %Lu\n", printf("\t\textent data refs %u owner %llu\n",
btrfs_extent_refs(ei), btrfs_extent_refs(ei),
btrfs_extent_owner(ei)); (unsigned long long)btrfs_extent_owner(ei));
break; break;
case BTRFS_CSUM_ITEM_KEY: case BTRFS_CSUM_ITEM_KEY:
ci = btrfs_item_ptr(l, i, ci = btrfs_item_ptr(l, i,
@ -99,18 +99,19 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
btrfs_file_extent_inline_len(l->items + i)); btrfs_file_extent_inline_len(l->items + i));
break; break;
} }
printf("\t\textent data disk block %Lu nr %Lu\n", printf("\t\textent data disk block %llu nr %llu\n",
btrfs_file_extent_disk_blocknr(fi), (unsigned long long)btrfs_file_extent_disk_blocknr(fi),
btrfs_file_extent_disk_num_blocks(fi)); (unsigned long long)btrfs_file_extent_disk_num_blocks(fi));
printf("\t\textent data offset %Lu nr %Lu\n", printf("\t\textent data offset %llu nr %llu\n",
btrfs_file_extent_offset(fi), (unsigned long long)btrfs_file_extent_offset(fi),
btrfs_file_extent_num_blocks(fi)); (unsigned long long)btrfs_file_extent_num_blocks(fi));
break; break;
case BTRFS_BLOCK_GROUP_ITEM_KEY: case BTRFS_BLOCK_GROUP_ITEM_KEY:
bi = btrfs_item_ptr(l, i, bi = btrfs_item_ptr(l, i,
struct btrfs_block_group_item); struct btrfs_block_group_item);
printf("\t\tblock group used %Lu flags %x\n", printf("\t\tblock group used %llu flags %x\n",
btrfs_block_group_used(bi), bi->flags); (unsigned long long)btrfs_block_group_used(bi),
bi->flags);
break; break;
case BTRFS_STRING_ITEM_KEY: case BTRFS_STRING_ITEM_KEY:
printf("\t\titem data %.*s\n", btrfs_item_size(item), printf("\t\titem data %.*s\n", btrfs_item_size(item),
@ -134,20 +135,20 @@ void btrfs_print_tree(struct btrfs_root *root, struct btrfs_buffer *t)
btrfs_print_leaf(root, (struct btrfs_leaf *)c); btrfs_print_leaf(root, (struct btrfs_leaf *)c);
return; return;
} }
printf("node %Lu level %d ptrs %d free %u generation %Lu owner %Lu\n", printf("node %llu level %d ptrs %d free %u generation %llu owner %llu\n",
t->blocknr, (unsigned long long)t->blocknr,
btrfs_header_level(&c->header), nr, btrfs_header_level(&c->header), nr,
(u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr, (u32)BTRFS_NODEPTRS_PER_BLOCK(root) - nr,
btrfs_header_generation(&c->header), (unsigned long long)btrfs_header_generation(&c->header),
btrfs_header_owner(&c->header)); (unsigned long long)btrfs_header_owner(&c->header));
fflush(stdout); fflush(stdout);
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
printf("\tkey %d (%Lu %x %Lu) block %Lu\n", printf("\tkey %d (%llu %x %llu) block %llu\n",
i, i,
c->ptrs[i].key.objectid, (unsigned long long)c->ptrs[i].key.objectid,
c->ptrs[i].key.flags, c->ptrs[i].key.flags,
c->ptrs[i].key.offset, (unsigned long long)c->ptrs[i].key.offset,
btrfs_node_blockptr(c, i)); (unsigned long long)btrfs_node_blockptr(c, i));
fflush(stdout); fflush(stdout);
} }
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {

16
random-test.c
View File

@ -48,7 +48,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
unsigned long oid; unsigned long oid;
btrfs_init_path(&path); btrfs_init_path(&path);
ret = setup_key(radix, &key, 0); ret = setup_key(radix, &key, 0);
sprintf(buf, "str-%Lu\n", key.objectid); sprintf(buf, "str-%llu\n", (unsigned long long)key.objectid);
ret = btrfs_insert_item(trans, root, &key, buf, strlen(buf)); ret = btrfs_insert_item(trans, root, &key, buf, strlen(buf));
if (ret) if (ret)
goto error; goto error;
@ -60,7 +60,7 @@ static int ins_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
goto error; goto error;
return ret; return ret;
error: error:
printf("failed to insert %Lu\n", key.objectid); printf("failed to insert %llu\n", (unsigned long long)key.objectid);
return -1; return -1;
} }
@ -75,10 +75,11 @@ static int insert_dup(struct btrfs_trans_handle *trans, struct btrfs_root
ret = setup_key(radix, &key, 1); ret = setup_key(radix, &key, 1);
if (ret < 0) if (ret < 0)
return 0; return 0;
sprintf(buf, "str-%Lu\n", key.objectid); sprintf(buf, "str-%llu\n", (unsigned long long)key.objectid);
ret = btrfs_insert_item(trans, root, &key, buf, strlen(buf)); ret = btrfs_insert_item(trans, root, &key, buf, strlen(buf));
if (ret != -EEXIST) { if (ret != -EEXIST) {
printf("insert on %Lu gave us %d\n", key.objectid, ret); printf("insert on %llu gave us %d\n",
(unsigned long long)key.objectid, ret);
return 1; return 1;
} }
return 0; return 0;
@ -107,7 +108,7 @@ static int del_one(struct btrfs_trans_handle *trans, struct btrfs_root *root,
goto error; goto error;
return 0; return 0;
error: error:
printf("failed to delete %Lu\n", key.objectid); printf("failed to delete %llu\n", (unsigned long long)key.objectid);
return -1; return -1;
} }
@ -127,7 +128,7 @@ static int lookup_item(struct btrfs_trans_handle *trans, struct btrfs_root
goto error; goto error;
return 0; return 0;
error: error:
printf("unable to find key %Lu\n", key.objectid); printf("unable to find key %llu\n", (unsigned long long)key.objectid);
return -1; return -1;
} }
@ -147,7 +148,8 @@ static int lookup_enoent(struct btrfs_trans_handle *trans, struct btrfs_root
goto error; goto error;
return 0; return 0;
error: error:
printf("able to find key that should not exist %Lu\n", key.objectid); printf("able to find key that should not exist %llu\n",
(unsigned long long)key.objectid);
return -1; return -1;
} }