macOS: compile fixes for latest rebase

Author: lundman

include/os/macos/zfs/sys/zfs_vfsops_os.h

@@ -166,8 +166,38 @@ int zfs_vfs_uuid_unparse(uuid_t uuid, char *dst);
 int zfs_vfs_uuid_gen(const char *osname, uuid_t uuid);
 #endif
 
+#define	ZFS_TEARDOWN_INIT(zfsvfs)		\
+	rrm_init(&(zfsvfs)->z_teardown_lock, B_FALSE)
 
-#define	ZFS_SUPER_MAGIC	0x2fc12fc1
+#define	ZFS_TEARDOWN_DESTROY(zfsvfs)		\
+	rrm_destroy(&(zfsvfs)->z_teardown_lock)
+
+#define	ZFS_TEARDOWN_TRY_ENTER_READ(zfsvfs)	\
+	rw_tryenter(&(zfsvfs)->z_teardown_lock, RW_READER)
+
+#define	ZFS_TEARDOWN_ENTER_READ(zfsvfs, tag)	\
+	rrm_enter_read(&(zfsvfs)->z_teardown_lock, tag);
+
+#define	ZFS_TEARDOWN_EXIT_READ(zfsvfs, tag)	\
+	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
+
+#define	ZFS_TEARDOWN_ENTER_WRITE(zfsvfs, tag)	\
+	rrm_enter(&(zfsvfs)->z_teardown_lock, RW_WRITER, tag)
+
+#define	ZFS_TEARDOWN_EXIT_WRITE(zfsvfs)		\
+	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
+
+#define	ZFS_TEARDOWN_EXIT(zfsvfs, tag)		\
+	rrm_exit(&(zfsvfs)->z_teardown_lock, tag)
+
+#define	ZFS_TEARDOWN_READ_HELD(zfsvfs)		\
+	RRM_READ_HELD(&(zfsvfs)->z_teardown_lock)
+
+#define	ZFS_TEARDOWN_WRITE_HELD(zfsvfs)		\
+	RRM_WRITE_HELD(&(zfsvfs)->z_teardown_lock)
+
+#define	ZFS_TEARDOWN_HELD(zfsvfs)		\
+	RRM_LOCK_HELD(&(zfsvfs)->z_teardown_lock)
 
 #define	ZSB_XATTR	0x0001		/* Enable user xattrs */
 

lib/libspl/os/macos/getexecname.c

@@ -23,9 +23,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include "../../libspl_impl.h"
 
-const char *
+__attribute__((visibility("hidden"))) ssize_t
 getexecname_impl(char *execname)
 {
-	return (getprogname());
+	strlcpy(execname, getprogname(), PATH_MAX);
+	return (strlen(execname));
 }

module/os/macos/zfs/vdev_disk.c

@@ -482,8 +482,7 @@ vdev_disk_ioctl_free(zio_t *zio)
 }
 
 static const zio_vsd_ops_t vdev_disk_vsd_ops = {
-	vdev_disk_ioctl_free,
-	zio_vsd_default_cksum_report
+	.vsd_free = vdev_disk_ioctl_free,
 };
 
 static void

module/os/macos/zfs/zfs_ioctl_os.c

@@ -91,6 +91,16 @@ zfsdev_get_dev(void)
 	return ((dev_t)tsd_get(zfsdev_private_tsd));
 }
 
+/* Not sure what these are supposed to be - upstream assumes they can be set */
+void
+zfsdev_private_set_state(void *priv, zfsdev_state_t *zs)
+{
+}
+
+zfsdev_state_t *
+zfsdev_private_get_state(void *priv)
+{
+}
 
 static int
 zfsdev_open(dev_t dev, int flags, int devtype, struct proc *p)