Skip to contentSkip to conversation

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

PATCH Holger Fischer 2 participants 2 messages May 20, 2013 – Jun 5, 2013 Btrfs file system

lore
Share & tools
lore
#0 lore raw

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 ...

Quoted 1 line

cat 02-ftbfs.patch

Authors:
Luca Bruno <[email protected]>
Alexander Kurtz <[email protected]>
Daniel Baumann <[email protected]>
Description:
Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha and ia64 (Closes: #539433, #583768).

convert.c +1 -1
Index: 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

#1 lore raw
Quoted 3 lines · Holger Fischer

Dear BTRFS-Community,

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

Thanks for bringing it up.

Quoted 16 lines

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

Quoted 1 line

cat 02-ftbfs.patch

Authors:
Luca Bruno <[email protected]>
Alexander Kurtz <[email protected]>
Daniel Baumann <[email protected]>
Description:
Patch to properly cast and avoiding compiler warnings. Fixes FTBFS on alpha and ia64 (Closes: #539433, #583768).

Index: b/convert.c
===================================================================

convert.c int do_rollback(const char *devname, int · line 2515

Quoted 5 lines
convert.c +1 -1
@@ -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