]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
fs/zfs/zfs: Use format code "%llu" for 64-bit uint bp->blk_prop in grub_error()
authorGlenn Washburn <development@efficientek.com>
Fri, 5 Mar 2021 00:22:43 +0000 (18:22 -0600)
committerDaniel Kiper <daniel.kiper@oracle.com>
Wed, 10 Mar 2021 14:23:33 +0000 (15:23 +0100)
This is a temporary, less-intrusive change to get the build to success with
compiler format string checking turned on. There is a better fix which
addresses this issue, but it needs more testing. Use this change so that
format string checking on grub_error() can be turned on until the better
change is fully tested.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
grub-core/fs/zfs/zfs.c

index 9ef2fd61ada4fb7e679b32ddb81cd1a8c3100bcd..f9e755197c58d9cc96eee08a6d8199ab98fd9fc8 100644 (file)
@@ -1869,8 +1869,8 @@ zio_read (blkptr_t *bp, grub_zfs_endian_t endian, void **buf,
     {
       if (BPE_GET_ETYPE(bp) != BP_EMBEDDED_TYPE_DATA)
        return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                          "unsupported embedded BP (type=%u)\n",
-                          BPE_GET_ETYPE(bp));
+                          "unsupported embedded BP (type=%llu)\n",
+                          (long long unsigned int) BPE_GET_ETYPE(bp));
       lsize = BPE_GET_LSIZE(bp);
       psize = BF64_GET_SB(grub_zfs_to_cpu64 ((bp)->blk_prop, endian), 25, 7, 0, 1);
     }