mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
FreeBSD: Reduce divergence from in-tree sources
This includes random small tweaks, primarily a build fixes, required when ZFS is built as part of FreeBSD base. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de> Signed-off-by: Alexander Motin <mav@FreeBSD.org> Sponsored by: iXsystems, Inc. Closes #15368
This commit is contained in:
committed by
Brian Behlendorf
parent
120d1787d7
commit
f6e6e77ed8
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*
|
||||
* Copyright (c) 2022 Rob Wing
|
||||
*
|
||||
|
||||
@@ -141,7 +141,7 @@ zfsdev_ioctl(struct cdev *dev, ulong_t zcmd, caddr_t arg, int flag,
|
||||
if (len != sizeof (zfs_iocparm_t))
|
||||
return (EINVAL);
|
||||
|
||||
uaddr = (void *)zp->zfs_cmd;
|
||||
uaddr = (void *)(uintptr_t)zp->zfs_cmd;
|
||||
zc = vmem_zalloc(sizeof (zfs_cmd_t), KM_SLEEP);
|
||||
#ifdef ZFS_LEGACY_SUPPORT
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user