Package:  btrfs-tools
Version:  0.19-2
Severity: serious
Tags:     patch

Some warnings of the form:
format '%llu' expects type 'long long unsigned int' but argument has
type 'u64'
in conjunction with -Werror are causing build failures on ia64 and
alpha. Patch attached to properly cast them, avoiding compiler
warnings.
This is becoming boring to fix at each release :)

Cheers, Luca

-- 
 .''`.  ** Debian GNU/Linux **  | Luca Bruno (kaeso)
: :'  :   The Universal O.S.    | lucab (AT) debian.org
`. `'`                          | GPG Key ID: 3BFB9FB3
  `-     http://www.debian.org  | Debian GNU/Linux Developer
Index: btrfs-tools-0.19/disk-io.c
===================================================================
--- btrfs-tools-0.19.orig/disk-io.c	2009-07-31 13:14:50.000000000 -0600
+++ btrfs-tools-0.19/disk-io.c	2009-07-31 13:14:51.000000000 -0600
@@ -678,7 +678,8 @@
 		   ~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 @@
 		~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);
 	}
 
Index: btrfs-tools-0.19/extent-tree.c
===================================================================
--- btrfs-tools-0.19.orig/extent-tree.c	2009-07-31 13:14:50.000000000 -0600
+++ btrfs-tools-0.19/extent-tree.c	2009-07-31 13:14:51.000000000 -0600
@@ -1448,7 +1448,8 @@
 		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();
 	}
 
Index: btrfs-tools-0.19/print-tree.c
===================================================================
--- btrfs-tools-0.19.orig/print-tree.c	2009-07-31 13:14:50.000000000 -0600
+++ btrfs-tools-0.19/print-tree.c	2009-07-31 13:14:51.000000000 -0600
@@ -494,7 +494,7 @@
 		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");
Index: btrfs-tools-0.19/convert.c
===================================================================
--- btrfs-tools-0.19.orig/convert.c	2009-07-31 13:15:38.000000000 -0600
+++ btrfs-tools-0.19/convert.c	2009-07-31 13:15:48.000000000 -0600
@@ -2579,7 +2579,7 @@
 	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;
 	}
 

Attachment: pgp4qEpiAKcXO.pgp
Description: PGP signature

Reply via email to