]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
DDF: cast print arguments in super-ddf.c
authorGuy Menanteau <menantea@linux.vnet.ibm.com>
Mon, 4 Aug 2014 14:53:03 +0000 (16:53 +0200)
committerNeilBrown <neilb@suse.de>
Mon, 4 Aug 2014 22:57:48 +0000 (08:57 +1000)
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>
super-ddf.c

index 8957c2e35362ba978962548b254d2ee28a4a9640..bc0ce2c0fd253609d47341666f19ce6093bebf86 100644 (file)
@@ -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