D35923.lt.diff
No OneTemporary
Actions

Size

963 B

Referenced Files

None

Subscribers

None

D35923.lt.diff
View Options

	diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
	--- a/stand/libsa/zfs/Makefile.inc
	+++ b/stand/libsa/zfs/Makefile.inc
	@@ -60,7 +60,8 @@
	# zfs.c is special: we need to define HAS_ZSTD_ZFS to get zfssubr.c to initialize zstd
	# properly. We need to have the cddl boot compat directory in the include path for zfssubr.c
	# to be found, and we need a couple of other include paths for skein and lz4. Finally we
	-# temporarily need LDRSRC to pick up disk.h until that layering violation is corrected.
	+# temporarily need LDRSRC to pick up part.h until libsa has a way to look into partitions
	+# or enumerate them...
	#
	CFLAGS.zfs.c+= -DHAS_ZSTD_ZFS \
	-I${SYSDIR}/cddl/boot/zfs \
	diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c
	--- a/stand/libsa/zfs/zfs.c
	+++ b/stand/libsa/zfs/zfs.c
	@@ -1634,6 +1634,7 @@
	.dv_ioctl = noioctl,
	.dv_print = zfs_dev_print,
	.dv_cleanup = nullsys,
	+ .dv_fmtdev = zfs_fmtdev,
	};

	int