Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/prg-localcount2]: src/external/cddl/osnet/dist/uts/common/fs/zfs The zfs...



details:   https://anonhg.NetBSD.org/src/rev/39d3aa43c2ec
branches:  prg-localcount2
changeset: 823514:39d3aa43c2ec
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Fri Apr 28 01:49:38 2017 +0000

description:
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?

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c |  6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diffs (30 lines):

diff -r d1f301906831 -r 39d3aa43c2ec external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Thu Apr 27 23:18:21 2017 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Fri Apr 28 01:49:38 2017 +0000
@@ -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 @@
 }
 
 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 cdevsw zfs_cdevsw = {
+       DEVSW_MODULE_INIT
        .d_open = nb_zvol_copen,
        .d_close = nb_zvol_cclose,
        .d_read = nb_zvol_read,



Home | Main Index | Thread Index | Old Index