← Back to branch summary

~ubuntu-branches/debian/jessie/btrfs-tools/jessie

« back to all changes in this revision

Viewing changes to debian/patches/0001-Properly-cast-to-avoid-compiler-warnings-fixes-FTBFS.patch

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-10-11 16:54:05 UTC
  • mfrom: (1.2.14) (6.1.39 sid)
  • Revision ID: package-import@ubuntu.com-20141011165405-zvdemnhzw41f2doj
Tags: 3.16.2-1
* New upstream release.
* Drop patches (not needed, or upstremed), but unaligned memory access.
* Update upstream location in uscan, to pull release by kdave.
* Use upstream fsck.btrfs script.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-Properly-cast-to-avoid-compiler-warnings-fixes-FTBFS.patch
1
 
From df08d276ac3660f11a398727eb67f23852d7bb59 Mon Sep 17 00:00:00 2001
2
 
From: Dimitri John Ledkov <xnox@debian.org>
3
 
Date: Sat, 19 Apr 2014 11:40:34 +0100
4
 
Subject: Properly cast to avoid compiler warnings, fixes FTBFS on alpha and
5
 
 ia64.
6
 
 
7
 
Bug-Debian: http://bugs.debian.org/539433
8
 
Bug-Debian: http://bugs.debian.org/583768
9
 
Authors:
10
 
 Luca Bruno <lucab@debian.org>
11
 
 Alexander Kurtz <kurtz.alex@googlemail.com>
12
 
 Daniel Baumann <daniel.baumann@progress-technologies.net>
13
 
 
14
 
Signed-off-by: Dimitri John Ledkov <xnox@debian.org>
15
 
---
16
 
 btrfs-convert.c | 2 +-
17
 
 1 file changed, 1 insertion(+), 1 deletion(-)
18
 
 
19
 
diff --git a/btrfs-convert.c b/btrfs-convert.c
20
 
index 71b7bd6..3673050 100644
21
 
--- a/btrfs-convert.c
22
 
+++ b/btrfs-convert.c
23
 
@@ -2441,7 +2441,7 @@ static int do_rollback(const char *devname)
24
 
        ext2_root = btrfs_read_fs_root(root->fs_info, &key);
25
 
        if (!ext2_root || IS_ERR(ext2_root)) {
26
 
                fprintf(stderr, "unable to open subvol %llu\n",
27
 
-                       key.objectid);
28
 
+                       (unsigned long long) key.objectid);
29
 
                goto fail;
30
 
        }
31