Module Name: src Committed By: pgoyette Date: Fri Apr 28 01:49:38 UTC 2017
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [prg-localcount2]: zfs_ioctl.c Log Message: The zfs control device is loaded as a module under rump-server, so add the localcount stuff to its {b,c}devsw XXX How to feed this back to upstream? To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.6.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10.6.1 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10 Fri Apr 10 20:55:38 2015 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Fri Apr 28 01:49:38 2017 @@ -67,6 +67,10 @@ #include <sys/callb.h> #include <sys/taskq.h> +#ifdef __NetBSD__ +#include <sys/localcount.h> +#endif + #include "zfs_namecheck.h" #include "zfs_prop.h" #include "zfs_deleg.h" @@ -4563,6 +4567,7 @@ nb_zfsdev_ioctl(dev_t dev, u_long cmd, v } const struct bdevsw zfs_bdevsw = { + DEVSW_MODULE_INIT .d_open = nb_zvol_bopen, .d_close = nb_zvol_bclose, .d_strategy = zvol_strategy, @@ -4573,6 +4578,7 @@ const struct bdevsw zfs_bdevsw = { }; const struct cdevsw zfs_cdevsw = { + DEVSW_MODULE_INIT .d_open = nb_zvol_copen, .d_close = nb_zvol_cclose, .d_read = nb_zvol_read,