btrfs-tools: debian/patches/02-ftbfs.patch

btrfs-tools: debian/patches/02-ftbfs.patch

[Holger Fischer]

Dear BTRFS-Community,

as far as I understand I believe it would make sense to apply that one upstream:

like described, it ...  Fixes FTBFS on alpha and ia64 ...

 >cat 02-ftbfs.patch
Authors:
  Luca Bruno <lucab@debian.org>
  Alexander Kurtz <kurtz.alex@googlemail.com>
  Daniel Baumann <daniel.baumann@progress-technologies.net>
Description:
  Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha
  and ia64 (Closes: #539433, #583768).

Index: b/convert.c
===================================================================
--- a/convert.c
+++ b/convert.c
@@ -2512,7 +2512,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;
         }


The file convert.c was renamed recently to btrfs-convert.c.
The fprintf in the do_rollback-function doesn't contain the mentioned fix.

Best Regards
Holger Fischer

Re: btrfs-tools: debian/patches/02-ftbfs.patch

[David Sterba]

On Mon, May 20, 2013 at 02:59:27PM +0200, Holger Fischer wrote:
> Dear BTRFS-Community,
> 
> as far as I understand I believe it would make sense to apply that one upstream:

Thanks for bringing it up.

> like described, it ...  Fixes FTBFS on alpha and ia64 ...
> 
> >cat 02-ftbfs.patch
> Authors:
>  Luca Bruno <lucab@debian.org>
>  Alexander Kurtz <kurtz.alex@googlemail.com>
>  Daniel Baumann <daniel.baumann@progress-technologies.net>
> Description:
>  Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha
>  and ia64 (Closes: #539433, #583768).
> 
> Index: b/convert.c
> ===================================================================
> --- a/convert.c
> +++ b/convert.c
> @@ -2512,7 +2512,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);

There are way more instances of a missing (unsigned long long) casts,
quick grep from the ia64 build log counted ~100.  I prefer to fixem all
in one or at least separate by pure-userspace/-kernel code so we could
apply the bits on kernel too.


david