summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Menanteau <menantea@linux.vnet.ibm.com>2014-08-04 16:53:03 +0200
committerNeilBrown <neilb@suse.de>2014-08-05 08:57:48 +1000
commitd13566f9b6ff8377f45cd025a1cd1a58bcb4e857 (patch)
treec8748c320c0e98f25c011b057a269dc5c238ea06
parent5141638c54535b4ac80b8481404d868a63a18ecd (diff)
DDF: cast print arguments in super-ddf.c
mdadm fails to build on ppc64 and ppc64le architectures. === super-ddf.c: In function '_set_config_size': super-ddf.c:2849:4: error: format '%llx' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' [-Werror=format=] pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n", ^ super-ddf.c:2855:2: error: format '%llx' expects argument of type 'long long unsigned int', but argument 6 has type '__u64' [-Werror=format=] dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n", ^ cc1: all warnings being treated as errors <builtin>: recipe for target 'super-ddf.o' failed === Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1125883 Signed-off-by: <menantea@linux.vnet.ibm.com> Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--super-ddf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/super-ddf.c b/super-ddf.c
index 8957c2e3..bc0ce2c0 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -2847,13 +2847,15 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
__u64 wsp = cfs - t;
if (wsp > 1024*1024*2ULL && wsp > dl->size / 16) {
pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
- __func__, dl->major, dl->minor, wsp);
+ __func__, dl->major, dl->minor,
+ (unsigned long long)wsp);
} else
cfs = t;
}
pde->config_size = cpu_to_be64(cfs);
dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
- __func__, dl->major, dl->minor, cfs, dl->size-cfs);
+ __func__, dl->major, dl->minor,
+ (unsigned long long)cfs, (unsigned long long)(dl->size-cfs));
}
/* Add a device to a container, either while creating it or while