[src/pgoyette-localcount]: src/external/cddl/osnet More rump drivers that nee...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/550a3af4b8ce
branches:  pgoyette-localcount
changeset: 852811:550a3af4b8ce
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Jul 18 03:50:58 2016 +0000

description:
More rump drivers that need to have a 'struct localcount' when built
as modules.

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c                      |   4 ++--
 external/cddl/osnet/dev/sdt/sdt.c                      |   4 ++--
 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c    |   2 +-
 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c |  11 +++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diffs (93 lines):

diff -r 6358bf9034ab -r 550a3af4b8ce external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Mon Jul 18 03:49:59 2016 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Mon Jul 18 03:50:58 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.18.2.2 2016/07/17 05:18:11 pgoyette Exp $    */
+/*     $NetBSD: fbt.c,v 1.18.2.3 2016/07/18 03:50:58 pgoyette Exp $    */
 
 /*
  * CDDL HEADER START
@@ -166,7 +166,7 @@
        .d_mmap         = nommap,
        .d_kqfilter     = nokqfilter,
        .d_discard      = nodiscard,
-       .d_localcount   = fbt_localcount,
+       .d_localcount   = &fbt_localcount,
        .d_flag         = D_OTHER
 };
 
diff -r 6358bf9034ab -r 550a3af4b8ce external/cddl/osnet/dev/sdt/sdt.c
--- a/external/cddl/osnet/dev/sdt/sdt.c Mon Jul 18 03:49:59 2016 +0000
+++ b/external/cddl/osnet/dev/sdt/sdt.c Mon Jul 18 03:50:58 2016 +0000
@@ -39,7 +39,7 @@
  * unloaded; in particular, probes may not span multiple kernel modules.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.2 2016/07/17 05:18:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.3 2016/07/18 03:50:58 pgoyette Exp $");
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -133,7 +133,7 @@
        .d_mmap         = nommap,
        .d_kqfilter     = nokqfilter,
        .d_discard      = nodiscard,
-       .d_localcount   = sdt_localcount,
+       .d_localcount   = &sdt_localcount,
        .d_flag         = D_OTHER
 };
 #endif
diff -r 6358bf9034ab -r 550a3af4b8ce external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Mon Jul 18 03:49:59 2016 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Mon Jul 18 03:50:58 2016 +0000
@@ -15353,7 +15353,7 @@
        .d_mmap         = nommap,
        .d_kqfilter     = nokqfilter,
        .d_discard      = nodiscard,
-       .d_localcount   = dtrace_localcount,
+       .d_localcount   = &dtrace_localcount,
        .d_flag         = D_OTHER | D_MPSAFE
 };
 
diff -r 6358bf9034ab -r 550a3af4b8ce external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Mon Jul 18 03:49:59 2016 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Mon Jul 18 03:50:58 2016 +0000
@@ -66,6 +66,7 @@
 #include <sys/dmu_objset.h>
 #include <sys/callb.h>
 #include <sys/taskq.h>
+#include <sys/localcount.h>
 
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
@@ -4562,6 +4563,10 @@
            &rval);
 }
 
+#ifdef _MODULE
+struct localcount zfs_b_localcount, zfs_c_localcount;
+#endif
+
 const struct bdevsw zfs_bdevsw = {
        .d_open = nb_zvol_bopen,
        .d_close = nb_zvol_bclose,
@@ -4569,6 +4574,9 @@
        .d_ioctl = nb_zfsdev_ioctl,
        .d_dump = nodump,
        .d_psize = nosize,
+#ifdef _MODULE
+       .d_localcount = &zfs_b_localcount,
+#endif
        .d_flag = D_DISK | D_MPSAFE
 };
 
@@ -4583,6 +4591,9 @@
        .d_poll = nopoll,
        .d_mmap = nommap,
        .d_kqfilter = nokqfilter,
+#ifdef _MODULE
+       .d_localcount = &zfs_c_localcount,
+#endif
        .d_flag = D_DISK | D_MPSAFE
 };