summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
deleted file mode 100644
index f573bbcefa..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-mdadm-fix-build-failures-ppc64.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Upstream-Status: Pending
2
3From 19986c721c9ac4b353c8592998d70d0dc8860bfd Mon Sep 17 00:00:00 2001
4From: Milan Broz <mbroz@redhat.com>
5Date: Thu, 14 Jul 2011 13:58:36 +1000
6Subject: [PATCH] mdadm: fix build failures (ppc64)
7
8This patch fixes these build issues:
9
10super-intel.c: In function 'getinfo_super_imsm_volume':
11super-intel.c:2327:4: error: format '%llu' expects argument of type 'long long
12unsigned int', but argument 3 has type '__u64' [-Werror=format]
13
14super-intel.c: In function 'imsm_reshape_super':
15super-intel.c:8665:7: error: 'devnum' may be used uninitialized in this function [-Werror=uninitialized]
16
17Signed-off-by: Milan Broz <mbroz@redhat.com>
18Signed-off-by: NeilBrown <neilb@suse.de>
19---
20 super-intel.c | 9 ++++++---
21 1 files changed, 6 insertions(+), 3 deletions(-)
22
23diff --git a/super-intel.c b/super-intel.c
24index 5ea3b36..70cf993 100644
25--- a/super-intel.c
26+++ b/super-intel.c
27@@ -2326,7 +2326,9 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
28
29 dprintf("IMSM: General Migration checkpoint : %llu "
30 "(%llu) -> read reshape progress : %llu\n",
31- units, blocks_per_unit, info->reshape_progress);
32+ (unsigned long long)units,
33+ (unsigned long long)blocks_per_unit,
34+ info->reshape_progress);
35
36 used_disks = imsm_num_data_members(dev, 1);
37 if (used_disks > 0) {
38@@ -8661,8 +8663,9 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level,
39 dprintf("imsm: info: Volume operation\n");
40 /* find requested device */
41 while (dev) {
42- imsm_find_array_minor_by_subdev(dev->index, st->container_dev, &devnum);
43- if (devnum == geo.dev_id)
44+ if (imsm_find_array_minor_by_subdev(
45+ dev->index, st->container_dev, &devnum) == 0
46+ && devnum == geo.dev_id)
47 break;
48 dev = dev->next;
49 }
50--
511.7.6.1
52