From: Glenn Washburn Date: Fri, 5 Mar 2021 00:22:43 +0000 (-0600) Subject: fs/zfs/zfs: Use format code "%llu" for 64-bit uint bp->blk_prop in grub_error() X-Git-Tag: grub-2.06-rc1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e458caffb82a4cf84908be760d3959fcf5ca634a;p=thirdparty%2Fgrub.git fs/zfs/zfs: Use format code "%llu" for 64-bit uint bp->blk_prop in grub_error() 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 Reviewed-by: Daniel Kiper --- diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c index 9ef2fd61a..f9e755197 100644 --- a/grub-core/fs/zfs/zfs.c +++ b/grub-core/fs/zfs/zfs.c @@ -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); }