git: 913f2d2e0cd3 - main - Merge commit 79a357c2a from openzfs git (by Adrian Chadd):

[Ryan Libby]

The branch main has been updated by rlibby:

URL: https://cgit.FreeBSD.org/src/commit/?id=913f2d2e0cd37b491deb691a84ad5c4e95ef0a24

commit 913f2d2e0cd37b491deb691a84ad5c4e95ef0a24
Author:     Ryan Libby <rlibby at FreeBSD.org>
AuthorDate: 2020-12-27 22:33:13 +0000
Commit:     Ryan Libby <rlibby at FreeBSD.org>
CommitDate: 2020-12-27 22:33:13 +0000

    Merge commit 79a357c2a from openzfs git (by Adrian Chadd):
    
      Fix pointer-is-uint64_t-sized assumption in the ioctl path
    
      This shows up when compiling freebsd-head on amd64 using gcc-6.4.
      The lib32 compat build ends up tripping over this assumption.
    
      Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
      Reviewed-by: Ryan Moeller <ryan at iXsystems.com>
      Signed-off-by: adrian chadd <adrian at freebsd.org>
      Closes #11068
      Closes #11069
---
 sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c b/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
index 3e70fef1ec3d..baaf4b598ab1 100644
--- a/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
+++ b/sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
@@ -55,7 +55,7 @@ zcmd_ioctl_compat(int fd, int request, zfs_cmd_t *zc, const int cflag)
 	switch (cflag) {
 	case ZFS_CMD_COMPAT_NONE:
 		ncmd = _IOWR('Z', request, zfs_iocparm_t);
-		zp.zfs_cmd = (uint64_t)zc;
+		zp.zfs_cmd = (uint64_t)(uintptr_t)zc;
 		zp.zfs_cmd_size = sizeof (zfs_cmd_t);
 		zp.zfs_ioctl_version = ZFS_IOCVER_OZFS;
 		break;
@@ -64,7 +64,7 @@ zcmd_ioctl_compat(int fd, int request, zfs_cmd_t *zc, const int cflag)
 		ncmd = _IOWR('Z', newrequest, zfs_iocparm_t);
 		zc_c = malloc(sizeof (zfs_cmd_legacy_t));
 		zfs_cmd_ozfs_to_legacy(zc, zc_c);
-		zp.zfs_cmd = (uint64_t)zc_c;
+		zp.zfs_cmd = (uint64_t)(uintptr_t)zc_c;
 		zp.zfs_cmd_size = sizeof (zfs_cmd_legacy_t);
 		zp.zfs_ioctl_version = ZFS_IOCVER_LEGACY;
 		break;