reopen 539433 ! forcemerge 539433 583768 thanks It seems we didn't get 'em all...
https://buildd.debian.org/fetch.cgi?pkg=btrfs-tools&arch=ia64&ver=0.19%2B20100601-1&stamp=1275408386&file=log&as=raw says: btrfs-list.c: In function 'resolve_root': btrfs-list.c:252: error: format '%llu' expects type 'long long unsigned int', but argument 2 has type 'u64' btrfs-list.c:252: error: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64' make[2]: *** [btrfs-list.o] Error 1 Attached is an updated version of `02-ftbfs.patch' which should fix this error. Could someone with access to an alpha/ia64 box perhaps fix the remaining missing casts, if there are any? Alternatively you could send me a link to a *working* alpha/ia64 emulator so I can do it myself. Best Regards Alexander Kurtz
Author: Luca Bruno <lu...@debian.org> and Alexander Kurtz <kurtz.a...@googlemail.com>
Description:
Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha
and ia64 (Closes: #539433 and #583768).
diff -Naurp btrfs-tools.orig//btrfs-list.c btrfs-tools/btrfs-list.c
--- btrfs-tools.orig//btrfs-list.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/btrfs-list.c 2010-06-02 17:02:23.382074752 +0200
@@ -248,7 +248,7 @@ static int resolve_root(struct root_look
break;
}
}
- printf("ID %llu top level %llu path %s\n", ri->root_id, top_id,
+ printf("ID %llu top level %llu path %s\n", (long long unsigned int) ri->root_id, (long long unsigned int) top_id,
full_path);
free(full_path);
return 0;
diff -Naurp btrfs-tools.orig//btrfs-map-logical.c btrfs-tools/btrfs-map-logical.c
--- btrfs-tools.orig//btrfs-map-logical.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/btrfs-map-logical.c 2010-06-02 17:00:30.917638980 +0200
@@ -65,7 +65,7 @@ struct extent_buffer *debug_read_block(s
eb->dev_bytenr = multi->stripes[0].physical;
fprintf(info_file, "mirror %d logical %Lu physical %Lu "
- "device %s\n", mirror_num, bytenr, eb->dev_bytenr,
+ "device %s\n", mirror_num, (long long unsigned int) bytenr, (long long unsigned int) eb->dev_bytenr,
device->name);
kfree(multi);
diff -Naurp btrfs-tools.orig//convert.c btrfs-tools/convert.c
--- btrfs-tools.orig//convert.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/convert.c 2010-06-02 17:00:30.917638980 +0200
@@ -2572,7 +2572,7 @@ int do_rollback(const char *devname, int
ext2_root = btrfs_read_fs_root(root->fs_info, &key);
if (!ext2_root || IS_ERR(ext2_root)) {
fprintf(stderr, "unable to open subvol %llu\n",
- key.objectid);
+ (unsigned long long) key.objectid);
goto fail;
}
diff -Naurp btrfs-tools.orig//disk-io.c btrfs-tools/disk-io.c
--- btrfs-tools.orig//disk-io.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/disk-io.c 2010-06-02 17:00:30.917638980 +0200
@@ -678,7 +678,8 @@ struct btrfs_root *open_ctree_fd(int fp,
~BTRFS_FEATURE_INCOMPAT_SUPP;
if (features) {
printk("couldn't open because of unsupported "
- "option features (%Lx).\n", features);
+ "option features (%Lx).\n",
+ (unsigned long long)features);
BUG_ON(1);
}
@@ -692,7 +693,8 @@ struct btrfs_root *open_ctree_fd(int fp,
~BTRFS_FEATURE_COMPAT_RO_SUPP;
if (writes && features) {
printk("couldn't open RDWR because of unsupported "
- "option features (%Lx).\n", features);
+ "option features (%Lx).\n",
+ (unsigned long long) features);
BUG_ON(1);
}
diff -Naurp btrfs-tools.orig//extent-tree.c btrfs-tools/extent-tree.c
--- btrfs-tools.orig//extent-tree.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/extent-tree.c 2010-06-02 17:00:30.921622049 +0200
@@ -1448,7 +1448,8 @@ int btrfs_lookup_extent_info(struct btrf
goto out;
if (ret != 0) {
btrfs_print_leaf(root, path->nodes[0]);
- printk("failed to find block number %Lu\n", bytenr);
+ printk("failed to find block number %Lu\n",
+ (unsigned long long) bytenr);
BUG();
}
diff -Naurp btrfs-tools.orig//print-tree.c btrfs-tools/print-tree.c
--- btrfs-tools.orig//print-tree.c 2010-06-01 07:18:01.000000000 +0200
+++ btrfs-tools/print-tree.c 2010-06-02 17:00:30.921622049 +0200
@@ -494,7 +494,7 @@ void btrfs_print_leaf(struct btrfs_root
case BTRFS_DIR_LOG_ITEM_KEY:
dlog = btrfs_item_ptr(l, i, struct btrfs_dir_log_item);
printf("\t\tdir log end %Lu\n",
- btrfs_dir_log_end(l, dlog));
+ (unsigned long long) btrfs_dir_log_end(l, dlog));
break;
case BTRFS_ORPHAN_ITEM_KEY:
printf("\t\torphan item\n");
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
