svn commit: r305376 - stable/11/sys/boot/efi/boot1

[Emmanuel Vadot]

Author: manu
Date: Sun Sep  4 08:52:09 2016
New Revision: 305376
URL: https://svnweb.freebsd.org/changeset/base/305376

Log:
  MFC 304221 and 304271
  
  Use %ju modifier for u_int64_t and %jd modifier for off_t.
  off_t is long long on arm32 and long on amd64
  
  Correctly print and cast u_int64_t and off_t.

Modified:
  stable/11/sys/boot/efi/boot1/ufs_module.c
  stable/11/sys/boot/efi/boot1/zfs_module.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/efi/boot1/ufs_module.c
==============================================================================
--- stable/11/sys/boot/efi/boot1/ufs_module.c	Sun Sep  4 01:47:21 2016	(r305375)
+++ stable/11/sys/boot/efi/boot1/ufs_module.c	Sun Sep  4 08:52:09 2016	(r305376)
@@ -56,9 +56,9 @@ dskread(void *buf, u_int64_t lba, int nb
 	    devinfo->dev->Media->MediaId, lba, size, buf);
 
 	if (status != EFI_SUCCESS) {
-		DPRINTF("dskread: failed dev: %p, id: %u, lba: %lu, size: %d, "
+		DPRINTF("dskread: failed dev: %p, id: %u, lba: %ju, size: %d, "
 		    "status: %lu\n", devinfo->dev,
-		    devinfo->dev->Media->MediaId, lba, size,
+		    devinfo->dev->Media->MediaId, (uintmax_t)lba, size,
 		    EFI_ERROR_CODE(status));
 		return (-1);
 	}

Modified: stable/11/sys/boot/efi/boot1/zfs_module.c
==============================================================================
--- stable/11/sys/boot/efi/boot1/zfs_module.c	Sun Sep  4 01:47:21 2016	(r305375)
+++ stable/11/sys/boot/efi/boot1/zfs_module.c	Sun Sep  4 08:52:09 2016	(r305376)
@@ -53,10 +53,10 @@ vdev_read(vdev_t *vdev, void *priv, off_
 	status = devinfo->dev->ReadBlocks(devinfo->dev,
 	    devinfo->dev->Media->MediaId, lba, bytes, buf);
 	if (status != EFI_SUCCESS) {
-		DPRINTF("vdev_read: failed dev: %p, id: %u, lba: %zu, size: %zu,"
-                    " status: %lu\n", devinfo->dev,
-                    devinfo->dev->Media->MediaId, lba, bytes,
-                    EFI_ERROR_CODE(status));
+		DPRINTF("vdev_read: failed dev: %p, id: %u, lba: %jd, size: %zu,"
+		    " status: %lu\n", devinfo->dev,
+		    devinfo->dev->Media->MediaId, (intmax_t)lba, bytes,
+		    EFI_ERROR_CODE(status));
 		return (-1);
 	}