CVS commit: [pgoyette-localcount] src/external/cddl/osnet
Module Name:src
Committed By: pgoyette
Date: Tue Jul 26 06:17:26 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt [pgoyette-localcount]: fbt.c
src/external/cddl/osnet/dev/sdt [pgoyette-localcount]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [pgoyette-localcount]:
dtrace.c
src/external/cddl/osnet/dist/uts/common/fs/zfs [pgoyette-localcount]:
zfs_ioctl.c
Log Message:
More renaming of LOCALCOUNT_INITIALIZER --> DEVSW_MODULE_INIT
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.4 -r1.18.2.5 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16.2.4 -r1.16.2.5 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32.2.4 -r1.32.2.5 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 \
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/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.4 src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.5
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.4 Tue Jul 19 06:27:00 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Tue Jul 26 06:17:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.18.2.4 2016/07/19 06:27:00 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.18.2.5 2016/07/26 06:17:26 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -153,7 +153,7 @@ static void fbt_resume(void *, dtrace_id
#define FBT_PROBETAB_SIZE 0x8000 /* 32k entries -- 128K total */
static const struct cdevsw fbt_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = fbt_open,
.d_close = noclose,
.d_read = noread,
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.4 src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.5
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.4 Tue Jul 19 06:27:00 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Tue Jul 26 06:17:26 2016
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.4 2016/07/19 06:27:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.5 2016/07/26 06:17:26 pgoyette Exp $");
#include
#include
@@ -120,7 +120,7 @@ sdt_open(dev_t dev, int flags, int mode,
}
static const struct cdevsw sdt_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = sdt_open,
.d_close = noclose,
.d_read = noread,
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.4 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.5
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.4 Tue Jul 19 06:27:01 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Tue Jul 26 06:17:26 2016
@@ -15340,7 +15340,7 @@ static dev_type_open(dtrace_open);
/* Just opens, clones to the fileops below */
const struct cdevsw dtrace_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = dtrace_open,
.d_close = noclose,
.d_read = noread,
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.2.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10.2.3
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.10.2.2 Tue Jul 19 06:27:01 2016
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Tue Jul 26 06:17:26 2016
@@ -4564,7 +4564,7 @@ nb_zfsdev_ioctl(dev_t dev, u_long cmd, v
}
const struct bdevsw zfs_bdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = nb_zvol_bopen,
.d_close = nb_zvol_bclose,
.d_strategy = zvol_strategy,
@@ -4575,7 +4575,7 @@ const struct bdevsw zfs_bdevsw = {
};
const struct cdevsw zfs_cdevsw = {
- LOCALCOUNT_INITIALIZER
+ DEVSW_MODULE_INIT
.d_open = nb_zvol_copen,
.d_close = nb_zvol_cclose,
.d_read = nb_zvol_read,
CVS commit: [pgoyette-localcount] src/external/cddl/osnet
Module Name:src
Committed By: pgoyette
Date: Mon Jul 18 03:50:58 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt [pgoyette-localcount]: fbt.c
src/external/cddl/osnet/dev/sdt [pgoyette-localcount]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [pgoyette-localcount]:
dtrace.c
src/external/cddl/osnet/dist/uts/common/fs/zfs [pgoyette-localcount]:
zfs_ioctl.c
Log Message:
More rump drivers that need to have a 'struct localcount' when built
as modules.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32.2.2 -r1.32.2.3 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
cvs rdiff -u -r1.10 -r1.10.2.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/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.2 src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.3
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.2 Sun Jul 17 05:18:11 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Mon Jul 18 03:50:58 2016
@@ -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 @@ static const struct cdevsw fbt_cdevsw =
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
- .d_localcount = fbt_localcount,
+ .d_localcount = _localcount,
.d_flag = D_OTHER
};
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.2 src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.3
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.2 Sun Jul 17 05:18:11 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Mon Jul 18 03:50:58 2016
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include
-__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
#include
@@ -133,7 +133,7 @@ static const struct cdevsw sdt_cdevsw =
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
- .d_localcount = sdt_localcount,
+ .d_localcount = _localcount,
.d_flag = D_OTHER
};
#endif
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.2 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.3
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.2 Sun Jul 17 05:18:11 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Mon Jul 18 03:50:58 2016
@@ -15353,7 +15353,7 @@ const struct cdevsw dtrace_cdevsw = {
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
.d_discard = nodiscard,
- .d_localcount = dtrace_localcount,
+ .d_localcount = _localcount,
.d_flag = D_OTHER | D_MPSAFE
};
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.2.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 Mon Jul 18 03:50:58 2016
@@ -66,6 +66,7 @@
#include
#include
#include
+#include
#include "zfs_namecheck.h"
#include "zfs_prop.h"
@@ -4562,6 +4563,10 @@ nb_zfsdev_ioctl(dev_t dev, u_long cmd, v
);
}
+#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 @@ const struct bdevsw zfs_bdevsw = {
.d_ioctl = nb_zfsdev_ioctl,
.d_dump = nodump,
.d_psize = nosize,
+#ifdef _MODULE
+ .d_localcount = _b_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
@@ -4583,6 +4591,9 @@ const struct cdevsw zfs_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+#ifdef _MODULE
+ .d_localcount = _c_localcount,
+#endif
.d_flag = D_DISK | D_MPSAFE
};
CVS commit: [pgoyette-localcount] src/external/cddl/osnet
Module Name:src
Committed By: pgoyette
Date: Sun Jul 17 05:18:12 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt [pgoyette-localcount]: fbt.c
src/external/cddl/osnet/dev/sdt [pgoyette-localcount]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [pgoyette-localcount]:
dtrace.c
Log Message:
Add the d_localcount member to the various {b,c}devsw structures.
No need for these to be conditional on _MODULE as dtrace is always
a module.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32.2.1 -r1.32.2.2 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.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/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.1 src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.2
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sun Jul 17 05:18:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.18.2.1 2016/07/16 11:27:12 pgoyette Exp $ */
+/* $NetBSD: fbt.c,v 1.18.2.2 2016/07/17 05:18:11 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#if defined(__i386__) || defined(__amd64__)
@@ -151,10 +152,22 @@ static void fbt_resume(void *, dtrace_id
#define FBT_ADDR2NDX(addr) uintptr_t)(addr)) >> 4) & fbt_probetab_mask)
#define FBT_PROBETAB_SIZE 0x8000 /* 32k entries -- 128K total */
+struct localcount fbt_localcount;
+
static const struct cdevsw fbt_cdevsw = {
- fbt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER, NULL
+ .d_open = fbt_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = fbt_localcount,
+ .d_flag = D_OTHER
};
static dtrace_pattr_t fbt_attr = {
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.1 src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.2
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sun Jul 17 05:18:11 2016
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.1 2016/07/16 11:27:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.2 2016/07/17 05:18:11 pgoyette Exp $");
#include
#include
@@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16
#include
#include
#include
+#include
#define KDTRACE_HOOKS
#include
@@ -118,13 +119,25 @@ sdt_open(dev_t dev, int flags, int mode,
return (0);
}
+struct localcount sdt_localcount;
+
static const struct cdevsw sdt_cdevsw = {
- sdt_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER, NULL
+ .d_open = sdt_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = sdt_localcount,
+ .d_flag = D_OTHER
};
#endif
-
+
static TAILQ_HEAD(, sdt_provider) sdt_prov_list;
#ifdef __FreeBSD__
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.1 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.2
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.1 Sat Jul 16 11:27:12 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sun Jul 17 05:18:11 2016
@@ -134,6 +134,7 @@
#include
#include
#include
+#include
#include
#include "dtrace_cddl.h"
#include "dtrace_debug.c"
@@ -15337,10 +15338,23 @@ static dev_type_open(dtrace_open);
/* Pseudo Device Entry points */
/* Just opens, clones to the fileops below */
+
+struct localcount dtrace_localcount;
+
const struct cdevsw dtrace_cdevsw = {
- dtrace_open, noclose, noread, nowrite, noioctl,
- nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER | D_MPSAFE, NULL
+ .d_open = dtrace_open,
+ .d_close = noclose,
+ .d_read = noread,
+ .d_write = nowrite,
+ .d_ioctl = noioctl,
+ .d_stop = nostop,
+ .d_tty = notty,
+ .d_poll = nopoll,
+ .d_mmap = nommap,
+ .d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
+ .d_localcount = dtrace_localcount,
+ .d_flag = D_OTHER | D_MPSAFE
};
static int dtrace_ioctl(struct file *fp, u_long cmd, void *data);
CVS commit: [pgoyette-localcount] src/external/cddl/osnet
Module Name:src
Committed By: pgoyette
Date: Sat Jul 16 11:27:12 UTC 2016
Modified Files:
src/external/cddl/osnet/dev/fbt [pgoyette-localcount]: fbt.c
src/external/cddl/osnet/dev/sdt [pgoyette-localcount]: sdt.c
src/external/cddl/osnet/dist/uts/common/dtrace [pgoyette-localcount]:
dtrace.c
Log Message:
Add an initializer for the cdevsw's localcount.
XXX These should maybe be converted to C99-style structure initialization?
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/external/cddl/osnet/dev/fbt/fbt.c
cvs rdiff -u -r1.16 -r1.16.2.1 src/external/cddl/osnet/dev/sdt/sdt.c
cvs rdiff -u -r1.32 -r1.32.2.1 \
src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.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/dev/fbt/fbt.c
diff -u src/external/cddl/osnet/dev/fbt/fbt.c:1.18 src/external/cddl/osnet/dev/fbt/fbt.c:1.18.2.1
--- src/external/cddl/osnet/dev/fbt/fbt.c:1.18 Thu Feb 26 10:31:52 2015
+++ src/external/cddl/osnet/dev/fbt/fbt.c Sat Jul 16 11:27:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fbt.c,v 1.18 2015/02/26 10:31:52 ozaki-r Exp $ */
+/* $NetBSD: fbt.c,v 1.18.2.1 2016/07/16 11:27:12 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -154,7 +154,7 @@ static void fbt_resume(void *, dtrace_id
static const struct cdevsw fbt_cdevsw = {
fbt_open, noclose, noread, nowrite, noioctl,
nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER
+ D_OTHER, NULL
};
static dtrace_pattr_t fbt_attr = {
Index: src/external/cddl/osnet/dev/sdt/sdt.c
diff -u src/external/cddl/osnet/dev/sdt/sdt.c:1.16 src/external/cddl/osnet/dev/sdt/sdt.c:1.16.2.1
--- src/external/cddl/osnet/dev/sdt/sdt.c:1.16 Thu Jun 16 06:08:06 2016
+++ src/external/cddl/osnet/dev/sdt/sdt.c Sat Jul 16 11:27:12 2016
@@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16 2016/06/16 06:08:06 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.16.2.1 2016/07/16 11:27:12 pgoyette Exp $");
#include
#include
@@ -121,7 +121,7 @@ sdt_open(dev_t dev, int flags, int mode,
static const struct cdevsw sdt_cdevsw = {
sdt_open, noclose, noread, nowrite, noioctl,
nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER
+ D_OTHER, NULL
};
#endif
Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32.2.1
--- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.32 Thu Jun 23 04:35:35 2016
+++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sat Jul 16 11:27:12 2016
@@ -15340,7 +15340,7 @@ static dev_type_open(dtrace_open);
const struct cdevsw dtrace_cdevsw = {
dtrace_open, noclose, noread, nowrite, noioctl,
nostop, notty, nopoll, nommap, nokqfilter, nodiscard,
- D_OTHER | D_MPSAFE
+ D_OTHER | D_MPSAFE, NULL
};
static int dtrace_ioctl(struct file *fp, u_long cmd, void *data);
