Index: arch/amiga/dev/event.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amiga/dev/event.c,v
retrieving revision 1.13
diff -u -r1.13 event.c
--- arch/amiga/dev/event.c	1 Mar 2008 14:16:49 -0000	1.13
+++ arch/amiga/dev/event.c	25 Oct 2017 07:43:41 -0000
@@ -190,8 +190,12 @@
 	return (1);
 }
 
-static const struct filterops ev_filtops =
-	{ 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_evrdetach,
+	.f_event = filt_evread,
+};
 
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: arch/arc/dev/opms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/dev/opms.c,v
retrieving revision 1.21
diff -u -r1.21 opms.c
--- arch/arc/dev/opms.c	25 Jul 2014 08:10:31 -0000	1.21
+++ arch/arc/dev/opms.c	25 Oct 2017 07:43:41 -0000
@@ -472,8 +472,12 @@
 	return kn->kn_data > 0;
 }
 
-static const struct filterops opmsread_filtops =
-	{ 1, NULL, filt_opmsrdetach, filt_opmsread };
+static const struct filterops opmsread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_opmsrdetach,
+	.f_event = filt_opmsread,
+};
 
 int
 opmskqfilter(dev_t dev, struct knote *kn)
Index: arch/atari/dev/event.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/event.c,v
retrieving revision 1.13
diff -u -r1.13 event.c
--- arch/atari/dev/event.c	14 Mar 2009 15:36:03 -0000	1.13
+++ arch/atari/dev/event.c	25 Oct 2017 07:43:42 -0000
@@ -189,8 +189,12 @@
 	return (1);
 }
 
-static const struct filterops ev_filtops =
-	{ 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_evrdetach,
+	.f_event = filt_evread,
+};
 
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: arch/landisk/dev/button.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/dev/button.c,v
retrieving revision 1.8
diff -u -r1.8 button.c
--- arch/landisk/dev/button.c	25 Jul 2014 08:10:33 -0000	1.8
+++ arch/landisk/dev/button.c	25 Oct 2017 07:43:45 -0000
@@ -312,11 +312,19 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops btn_read_filtops =
-    { 1, NULL, filt_btn_rdetach, filt_btn_read };
-
-static const struct filterops btn_write_filtops =
-    { 1, NULL, filt_btn_rdetach, filt_seltrue };
+static const struct filterops btn_read_filtops = {
+    .f_isfd = 1,
+    .f_attach = NULL,
+    .f_detach = filt_btn_rdetach,
+    .f_event = filt_btn_read,
+};
+
+static const struct filterops btn_write_filtops = {
+    .f_isfd = 1,
+    .f_attach = NULL,
+    .f_detach = filt_btn_rdetach,
+    .f_event = filt_seltrue,
+};
 
 int
 btnkqfilter(dev_t dev, struct knote *kn)
Index: arch/mac68k/dev/aed.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mac68k/dev/aed.c,v
retrieving revision 1.33
diff -u -r1.33 aed.c
--- arch/mac68k/dev/aed.c	25 Jul 2014 08:10:33 -0000	1.33
+++ arch/mac68k/dev/aed.c	25 Oct 2017 07:43:45 -0000
@@ -597,11 +597,19 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops aedread_filtops =
-	{ 1, NULL, filt_aedrdetach, filt_aedread };
-
-static const struct filterops aed_seltrue_filtops =
-	{ 1, NULL, filt_aedrdetach, filt_seltrue };
+static const struct filterops aedread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_aedrdetach,
+	.f_event = filt_aedread,
+};
+
+static const struct filterops aed_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_aedrdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 aedkqfilter(dev_t dev, struct knote *kn)
Index: arch/macppc/dev/aed.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/aed.c,v
retrieving revision 1.29
diff -u -r1.29 aed.c
--- arch/macppc/dev/aed.c	25 Jul 2014 08:10:34 -0000	1.29
+++ arch/macppc/dev/aed.c	25 Oct 2017 07:43:46 -0000
@@ -602,11 +602,19 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops aedread_filtops =
-	{ 1, NULL, filt_aedrdetach, filt_aedread };
-
-static const struct filterops aed_seltrue_filtops =
-	{ 1, NULL, filt_aedrdetach, filt_seltrue };
+static const struct filterops aedread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_aedrdetach,
+	.f_event = filt_aedread
+};
+
+static const struct filterops aed_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_aedrdetach,
+	.f_event = filt_seltrue
+};
 
 int
 aedkqfilter(dev_t dev, struct knote *kn)
Index: arch/sandpoint/sandpoint/satmgr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/satmgr.c,v
retrieving revision 1.26
diff -u -r1.26 satmgr.c
--- arch/sandpoint/sandpoint/satmgr.c	25 Jul 2014 08:10:34 -0000	1.26
+++ arch/sandpoint/sandpoint/satmgr.c	25 Oct 2017 07:43:48 -0000
@@ -602,8 +602,11 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops read_filtops = {
-	1, NULL, filt_rdetach, filt_read
+static const struct filterops read_filtops ={
+		.f_isfd = 1,
+		.f_attach = NULL,
+		.f_detach = filt_rdetach,
+		.f_event = filt_read,
 };
 
 static int
Index: arch/shark/shark/opms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/shark/shark/opms.c,v
retrieving revision 1.28
diff -u -r1.28 opms.c
--- arch/shark/shark/opms.c	7 Jul 2016 06:55:38 -0000	1.28
+++ arch/shark/shark/opms.c	25 Oct 2017 07:43:48 -0000
@@ -979,8 +979,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops opmsread_filtops =
-	{ 1, NULL, filt_opmsrdetach, filt_opmsread };
+static const struct filterops opmsread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_opmsrdetach,
+	.f_event = filt_opmsread,
+};
 
 int
 opmskqfilter(dev_t dev, struct knote *kn)
Index: arch/sparc/dev/tctrl.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/tctrl.c,v
retrieving revision 1.60
diff -u -r1.60 tctrl.c
--- arch/sparc/dev/tctrl.c	11 Dec 2016 16:25:54 -0000	1.60
+++ arch/sparc/dev/tctrl.c	25 Oct 2017 07:43:49 -0000
@@ -1230,8 +1230,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops tctrlread_filtops =
-	{ 1, NULL, filt_tctrlrdetach, filt_tctrlread };
+static const struct filterops tctrlread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_tctrlrdetach,
+	.f_event = filt_tctrlread,
+};
 
 int
 tctrlkqfilter(dev_t dev, struct knote *kn)
Index: arch/x68k/dev/event.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x68k/dev/event.c,v
retrieving revision 1.14
diff -u -r1.14 event.c
--- arch/x68k/dev/event.c	21 Mar 2014 16:58:54 -0000	1.14
+++ arch/x68k/dev/event.c	25 Oct 2017 07:43:49 -0000
@@ -216,8 +216,12 @@
 	return rv;
 }
 
-static const struct filterops ev_filtops =
-	{ 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_evrdetach,
+	.f_event = filt_evread,
+};
 
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: coda/coda_psdev.c
===================================================================
RCS file: /cvsroot/src/sys/coda/coda_psdev.c,v
retrieving revision 1.57
diff -u -r1.57 coda_psdev.c
--- coda/coda_psdev.c	7 Jul 2016 06:55:40 -0000	1.57
+++ coda/coda_psdev.c	25 Oct 2017 07:43:50 -0000
@@ -486,8 +486,12 @@
 	return (1);
 }
 
-static const struct filterops vc_nb_read_filtops =
-	{ 1, NULL, filt_vc_nb_detach, filt_vc_nb_read };
+static const struct filterops vc_nb_read_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_vc_nb_detach,
+	.f_event = filt_vc_nb_read,
+};
 
 int
 vc_nb_kqfilter(dev_t dev, struct knote *kn)
Index: dev/audio.c
===================================================================
RCS file: /cvsroot/src/sys/dev/audio.c,v
retrieving revision 1.413
diff -u -r1.413 audio.c
--- dev/audio.c	21 Oct 2017 09:58:56 -0000	1.413
+++ dev/audio.c	25 Oct 2017 07:43:52 -0000
@@ -3260,8 +3260,12 @@
 	return kn->kn_data > 0;
 }
 
-static const struct filterops audioread_filtops =
-	{ 1, NULL, filt_audiordetach, filt_audioread };
+static const struct filterops audioread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_audiordetach,
+	.f_event = filt_audioread,
+};
 
 static void
 filt_audiowdetach(struct knote *kn)
@@ -3305,8 +3309,12 @@
 	return kn->kn_data > 0;
 }
 
-static const struct filterops audiowrite_filtops =
-	{ 1, NULL, filt_audiowdetach, filt_audiowrite };
+static const struct filterops audiowrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_audiowdetach,
+	.f_event = filt_audiowrite,
+};
 
 int
 audio_kqfilter(struct audio_chan *chan, struct knote *kn)
Index: dev/midi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/midi.c,v
retrieving revision 1.86
diff -u -r1.86 midi.c
--- dev/midi.c	1 Jun 2017 09:44:30 -0000	1.86
+++ dev/midi.c	25 Oct 2017 07:43:53 -0000
@@ -1763,8 +1763,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops midiread_filtops =
-	{ 1, NULL, filt_midirdetach, filt_midiread };
+static const struct filterops midiread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_midirdetach,
+	.f_event = filt_midiread,
+};
 
 static void
 filt_midiwdetach(struct knote *kn)
@@ -1807,8 +1811,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops midiwrite_filtops =
-	{ 1, NULL, filt_midiwdetach, filt_midiwrite };
+static const struct filterops midiwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_midiwdetach,
+	.f_event = filt_midiwrite,
+};
 
 int
 midikqfilter(dev_t dev, struct knote *kn)
Index: dev/sequencer.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sequencer.c,v
retrieving revision 1.66
diff -u -r1.66 sequencer.c
--- dev/sequencer.c	1 Jun 2017 09:44:30 -0000	1.66
+++ dev/sequencer.c	25 Oct 2017 07:43:53 -0000
@@ -912,8 +912,12 @@
 	return rv;
 }
 
-static const struct filterops sequencerread_filtops =
-	{ 1, NULL, filt_sequencerrdetach, filt_sequencerread };
+static const struct filterops sequencerread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_sequencerrdetach,
+	.f_event = filt_sequencerread,
+};
 
 static void
 filt_sequencerwdetach(struct knote *kn)
@@ -946,8 +950,12 @@
 	return rv;
 }
 
-static const struct filterops sequencerwrite_filtops =
-	{ 1, NULL, filt_sequencerwdetach, filt_sequencerwrite };
+static const struct filterops sequencerwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_sequencerwdetach,
+	.f_event = filt_sequencerwrite,
+};
 
 static int
 sequencerkqfilter(dev_t dev, struct knote *kn)
Index: dev/apm/apm.c
===================================================================
RCS file: /cvsroot/src/sys/dev/apm/apm.c,v
retrieving revision 1.31
diff -u -r1.31 apm.c
--- dev/apm/apm.c	25 Jul 2014 08:10:36 -0000	1.31
+++ dev/apm/apm.c	25 Oct 2017 07:43:53 -0000
@@ -883,8 +883,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops apmread_filtops =
-	{ 1, NULL, filt_apmrdetach, filt_apmread };
+static const struct filterops apmread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_apmrdetach,
+	.f_event = filt_apmread,
+};
 
 int
 apmkqfilter(dev_t dev, struct knote *kn)
Index: dev/hpc/apm/apmdev.c
===================================================================
RCS file: /cvsroot/src/sys/dev/hpc/apm/apmdev.c,v
retrieving revision 1.30
diff -u -r1.30 apmdev.c
--- dev/hpc/apm/apmdev.c	25 Jul 2014 08:10:37 -0000	1.30
+++ dev/hpc/apm/apmdev.c	25 Oct 2017 07:43:54 -0000
@@ -925,8 +925,12 @@
 	return (kn->kn_data > 0);
 }
 
-static const struct filterops apmread_filtops =
-	{ 1, NULL, filt_apmrdetach, filt_apmread };
+static const struct filterops apmread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_apmrdetach,
+	.f_event = filt_apmread,
+};
 
 int
 apmdevkqfilter(dev_t dev, struct knote *kn)
Index: dev/ir/irframe_tty.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ir/irframe_tty.c,v
retrieving revision 1.61
diff -u -r1.61 irframe_tty.c
--- dev/ir/irframe_tty.c	20 Aug 2015 14:40:18 -0000	1.61
+++ dev/ir/irframe_tty.c	25 Oct 2017 07:43:54 -0000
@@ -823,10 +823,19 @@
 	return (0);
 }
 
-static const struct filterops irframetread_filtops =
-	{ 1, NULL, filt_irframetrdetach, filt_irframetread };
-static const struct filterops irframetwrite_filtops =
-	{ 1, NULL, filt_irframetwdetach, filt_irframetwrite };
+static const struct filterops irframetread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_irframetrdetach,
+	.f_event = filt_irframetread,
+};
+
+static const struct filterops irframetwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_irframetwdetach,
+	.f_event = filt_irframetwrite,
+};
 
 int
 irframet_kqfilter(void *h, struct knote *kn)
Index: dev/isa/satlink.c
===================================================================
RCS file: /cvsroot/src/sys/dev/isa/satlink.c,v
retrieving revision 1.45
diff -u -r1.45 satlink.c
--- dev/isa/satlink.c	25 Jul 2014 08:10:37 -0000	1.45
+++ dev/isa/satlink.c	25 Oct 2017 07:43:55 -0000
@@ -456,11 +456,19 @@
 	return (1);
 }
 
-static const struct filterops satlinkread_filtops =
-	{ 1, NULL, filt_satlinkrdetach, filt_satlinkread };
-
-static const struct filterops satlink_seltrue_filtops =
-	{ 1, NULL, filt_satlinkrdetach, filt_seltrue };
+static const struct filterops satlinkread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_satlinkrdetach,
+	.f_event = filt_satlinkread,
+};
+
+static const struct filterops satlink_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_satlinkrdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 satlinkkqfilter(dev_t dev, struct knote *kn)
Index: dev/pci/oboe.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pci/oboe.c,v
retrieving revision 1.44
diff -u -r1.44 oboe.c
--- dev/pci/oboe.c	20 Aug 2017 10:55:37 -0000	1.44
+++ dev/pci/oboe.c	25 Oct 2017 07:43:55 -0000
@@ -493,10 +493,19 @@
 	splx(s);
 }
 
-static const struct filterops oboeread_filtops =
-	{ 1, NULL, filt_oboerdetach, filt_oboeread };
-static const struct filterops oboewrite_filtops =
-	{ 1, NULL, filt_oboewdetach, filt_seltrue };
+static const struct filterops oboeread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_oboerdetach,
+	.f_event = filt_oboeread,
+};
+
+static const struct filterops oboewrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_oboewdetach,
+	.f_event = filt_seltrue,
+};
 
 static int
 oboe_kqfilter(void *h, struct knote *kn)
Index: dev/putter/putter.c
===================================================================
RCS file: /cvsroot/src/sys/dev/putter/putter.c,v
retrieving revision 1.35
diff -u -r1.35 putter.c
--- dev/putter/putter.c	25 Jul 2014 08:10:38 -0000	1.35
+++ dev/putter/putter.c	25 Oct 2017 07:43:56 -0000
@@ -490,8 +490,12 @@
 	return rv;
 }
 
-static const struct filterops putter_filtops =
-	{ 1, NULL, filt_putterdetach, filt_putter };
+static const struct filterops putter_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_putterdetach,
+	.f_event = filt_putter,
+};
 
 static int
 putter_fop_kqfilter(file_t *fp, struct knote *kn)
Index: dev/qbus/qd.c
===================================================================
RCS file: /cvsroot/src/sys/dev/qbus/qd.c,v
retrieving revision 1.56
diff -u -r1.56 qd.c
--- dev/qbus/qd.c	18 Oct 2014 08:33:28 -0000	1.56
+++ dev/qbus/qd.c	25 Oct 2017 07:43:57 -0000
@@ -1580,11 +1580,19 @@
 	return (1);
 }
 
-static const struct filterops qdread_filtops =
-	{ 1, NULL, filt_qdrdetach, filt_qdread };
-
-static const struct filterops qdwrite_filtops =
-	{ 1, NULL, filt_qdrdetach, filt_qdwrite };
+static const struct filterops qdread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_qdrdetach,
+	.f_event = filt_qdread,
+};
+
+static const struct filterops qdwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_qdrdetach,
+	.f_event = filt_qdwrite,
+};
 
 int
 qdkqfilter(dev_t dev, struct knote *kn)
Index: dev/sbus/bpp.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sbus/bpp.c,v
retrieving revision 1.41
diff -u -r1.41 bpp.c
--- dev/sbus/bpp.c	25 Jul 2014 08:10:38 -0000	1.41
+++ dev/sbus/bpp.c	25 Oct 2017 07:43:57 -0000
@@ -520,8 +520,12 @@
 	return 0;
 }
 
-static const struct filterops bppread_filtops =
-	{ 1, NULL, filt_bpprdetach, filt_bppread };
+static const struct filterops bppread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_bpprdetach,
+	.f_event = filt_bppread,
+};
 
 static void
 filt_bppwdetach(struct knote *kn)
@@ -546,8 +550,12 @@
 	return 1;
 }
 
-static const struct filterops bppwrite_filtops =
-	{ 1, NULL, filt_bppwdetach, filt_bpfwrite };
+static const struct filterops bppwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_bppwdetach,
+	.f_event = filt_bpfwrite,
+};
 
 int
 bppkqfilter(dev_t dev, struct knote *kn)
Index: dev/scsipi/ch.c
===================================================================
RCS file: /cvsroot/src/sys/dev/scsipi/ch.c,v
retrieving revision 1.91
diff -u -r1.91 ch.c
--- dev/scsipi/ch.c	20 Nov 2016 15:37:19 -0000	1.91
+++ dev/scsipi/ch.c	25 Oct 2017 07:43:57 -0000
@@ -487,11 +487,19 @@
 	return (1);
 }
 
-static const struct filterops chread_filtops =
-	{ 1, NULL, filt_chdetach, filt_chread };
-
-static const struct filterops chwrite_filtops =
-	{ 1, NULL, filt_chdetach, filt_seltrue };
+static const struct filterops chread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_chdetach,
+	.f_event = filt_chread,
+};
+
+static const struct filterops chwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_chdetach,
+	.f_event = filt_seltrue,
+};
 
 static int
 chkqfilter(dev_t dev, struct knote *kn)
Index: dev/sun/event.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sun/event.c,v
retrieving revision 1.23
diff -u -r1.23 event.c
--- dev/sun/event.c	14 Mar 2009 15:36:21 -0000	1.23
+++ dev/sun/event.c	25 Oct 2017 07:43:57 -0000
@@ -196,8 +196,12 @@
 	return (1);
 }
 
-static const struct filterops ev_filtops =
-	{ 1, NULL, filt_evrdetach, filt_evread };
+static const struct filterops ev_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_evrdetach,
+	.f_event = filt_evread,
+};
 
 int
 ev_kqfilter(struct evvar *ev, struct knote *kn)
Index: dev/sysmon/sysmon_power.c
===================================================================
RCS file: /cvsroot/src/sys/dev/sysmon/sysmon_power.c,v
retrieving revision 1.57
diff -u -r1.57 sysmon_power.c
--- dev/sysmon/sysmon_power.c	14 Dec 2015 01:08:47 -0000	1.57
+++ dev/sysmon/sysmon_power.c	25 Oct 2017 07:43:58 -0000
@@ -557,11 +557,19 @@
 	return kn->kn_data > 0;
 }
 
-static const struct filterops sysmon_power_read_filtops =
-    { 1, NULL, filt_sysmon_power_rdetach, filt_sysmon_power_read };
-
-static const struct filterops sysmon_power_write_filtops =
-    { 1, NULL, filt_sysmon_power_rdetach, filt_seltrue };
+static const struct filterops sysmon_power_read_filtops = {
+    .f_isfd = 1,
+    .f_attach = NULL,
+    .f_detach = filt_sysmon_power_rdetach,
+    .f_event = filt_sysmon_power_read,
+};
+
+static const struct filterops sysmon_power_write_filtops = {
+    .f_isfd = 1,
+    .f_attach = NULL,
+    .f_detach = filt_sysmon_power_rdetach,
+    .f_event = filt_seltrue,
+};
 
 /*
  * sysmonkqfilter_power:
Index: dev/usb/udsir.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/udsir.c,v
retrieving revision 1.4
diff -u -r1.4 udsir.c
--- dev/usb/udsir.c	1 Jun 2017 02:45:12 -0000	1.4
+++ dev/usb/udsir.c	25 Oct 2017 07:43:58 -0000
@@ -662,10 +662,19 @@
 	return revents;
 }
 
-static const struct filterops udsirread_filtops =
-	{ 1, NULL, filt_udsirrdetach, filt_udsirread };
-static const struct filterops udsirwrite_filtops =
-	{ 1, NULL, filt_udsirwdetach, filt_udsirwrite };
+static const struct filterops udsirread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_udsirrdetach,
+	.f_event = filt_udsirread,
+};
+
+static const struct filterops udsirwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_udsirwdetach,
+	.f_event = filt_udsirwrite,
+};
 
 static int
 udsir_kqfilter(void *h, struct knote *kn)
Index: dev/usb/ugen.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ugen.c,v
retrieving revision 1.135
diff -u -r1.135 ugen.c
--- dev/usb/ugen.c	5 Sep 2017 05:03:02 -0000	1.135
+++ dev/usb/ugen.c	25 Oct 2017 07:43:59 -0000
@@ -2025,17 +2025,33 @@
 	return 1;
 }
 
-static const struct filterops ugenread_intr_filtops =
-	{ 1, NULL, filt_ugenrdetach, filt_ugenread_intr };
-
-static const struct filterops ugenread_isoc_filtops =
-	{ 1, NULL, filt_ugenrdetach, filt_ugenread_isoc };
-
-static const struct filterops ugenread_bulk_filtops =
-	{ 1, NULL, filt_ugenrdetach, filt_ugenread_bulk };
-
-static const struct filterops ugenwrite_bulk_filtops =
-	{ 1, NULL, filt_ugenrdetach, filt_ugenwrite_bulk };
+static const struct filterops ugenread_intr_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ugenrdetach,
+	.f_event = filt_ugenread_intr,
+};
+
+static const struct filterops ugenread_isoc_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ugenrdetach,
+	.f_event = filt_ugenread_isoc,
+};
+
+static const struct filterops ugenread_bulk_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ugenrdetach,
+	.f_event = filt_ugenread_bulk,
+};
+
+static const struct filterops ugenwrite_bulk_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ugenrdetach,
+	.f_event = filt_ugenwrite_bulk,
+};
 
 int
 ugenkqfilter(dev_t dev, struct knote *kn)
Index: dev/usb/uhid.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uhid.c,v
retrieving revision 1.99
diff -u -r1.99 uhid.c
--- dev/usb/uhid.c	11 Mar 2017 12:41:14 -0000	1.99
+++ dev/usb/uhid.c	25 Oct 2017 07:43:59 -0000
@@ -750,11 +750,19 @@
 	return kn->kn_data > 0;
 }
 
-static const struct filterops uhidread_filtops =
-	{ 1, NULL, filt_uhidrdetach, filt_uhidread };
-
-static const struct filterops uhid_seltrue_filtops =
-	{ 1, NULL, filt_uhidrdetach, filt_seltrue };
+static const struct filterops uhidread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_uhidrdetach,
+	.f_event = filt_uhidread,
+};
+
+static const struct filterops uhid_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_uhidrdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 uhidkqfilter(dev_t dev, struct knote *kn)
Index: dev/usb/uirda.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uirda.c,v
retrieving revision 1.41
diff -u -r1.41 uirda.c
--- dev/usb/uirda.c	25 Nov 2016 12:56:29 -0000	1.41
+++ dev/usb/uirda.c	25 Oct 2017 07:43:59 -0000
@@ -640,10 +640,19 @@
 	splx(s);
 }
 
-static const struct filterops uirdaread_filtops =
-	{ 1, NULL, filt_uirdardetach, filt_uirdaread };
-static const struct filterops uirdawrite_filtops =
-	{ 1, NULL, filt_uirdawdetach, filt_seltrue };
+static const struct filterops uirdaread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_uirdardetach,
+	.f_event = filt_uirdaread,
+};
+
+static const struct filterops uirdawrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_uirdawdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 uirda_kqfilter(void *h, struct knote *kn)
Index: dev/usb/usb.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/usb.c,v
retrieving revision 1.166
diff -u -r1.166 usb.c
--- dev/usb/usb.c	1 Sep 2017 15:19:59 -0000	1.166
+++ dev/usb/usb.c	25 Oct 2017 07:44:00 -0000
@@ -875,8 +875,12 @@
 	return 1;
 }
 
-static const struct filterops usbread_filtops =
-	{ 1, NULL, filt_usbrdetach, filt_usbread };
+static const struct filterops usbread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_usbrdetach,
+	.f_event = filt_usbread,
+};
 
 int
 usbkqfilter(dev_t dev, struct knote *kn)
Index: dev/usb/uscanner.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/uscanner.c,v
retrieving revision 1.80
diff -u -r1.80 uscanner.c
--- dev/usb/uscanner.c	4 Dec 2016 10:12:35 -0000	1.80
+++ dev/usb/uscanner.c	25 Oct 2017 07:44:00 -0000
@@ -676,8 +676,12 @@
 	SLIST_REMOVE(&sc->sc_selq.sel_klist, kn, knote, kn_selnext);
 }
 
-static const struct filterops uscanner_seltrue_filtops =
-	{ 1, NULL, filt_uscannerdetach, filt_seltrue };
+static const struct filterops uscanner_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_uscannerdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 uscannerkqfilter(dev_t dev, struct knote *kn)
Index: dev/usb/ustir.c
===================================================================
RCS file: /cvsroot/src/sys/dev/usb/ustir.c,v
retrieving revision 1.37
diff -u -r1.37 ustir.c
--- dev/usb/ustir.c	1 Jun 2017 02:45:12 -0000	1.37
+++ dev/usb/ustir.c	25 Oct 2017 07:44:00 -0000
@@ -1087,10 +1087,19 @@
 	return sc->sc_direction != udir_input;
 }
 
-static const struct filterops ustirread_filtops =
-	{ 1, NULL, filt_ustirrdetach, filt_ustirread };
-static const struct filterops ustirwrite_filtops =
-	{ 1, NULL, filt_ustirwdetach, filt_ustirwrite };
+static const struct filterops ustirread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ustirrdetach,
+	.f_event = filt_ustirread,
+};
+
+static const struct filterops ustirwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ustirwdetach,
+	.f_event = filt_ustirwrite,
+};
 
 Static int
 ustir_kqfilter(void *h, struct knote *kn)
Index: dev/wscons/wsevent.c
===================================================================
RCS file: /cvsroot/src/sys/dev/wscons/wsevent.c,v
retrieving revision 1.36
diff -u -r1.36 wsevent.c
--- dev/wscons/wsevent.c	24 Aug 2015 22:50:33 -0000	1.36
+++ dev/wscons/wsevent.c	25 Oct 2017 07:44:00 -0000
@@ -340,8 +340,12 @@
 	return (1);
 }
 
-static const struct filterops wsevent_filtops =
-	{ 1, NULL, filt_wseventrdetach, filt_wseventread };
+static const struct filterops wsevent_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_wseventrdetach,
+	.f_event = filt_wseventread,
+};
 
 int
 wsevent_kqfilter(struct wseventvar *ev, struct knote *kn)
Index: external/bsd/drm2/drm/drm_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm2/drm/drm_drv.c,v
retrieving revision 1.17
diff -u -r1.17 drm_drv.c
--- external/bsd/drm2/drm/drm_drv.c	9 Nov 2015 22:04:53 -0000	1.17
+++ external/bsd/drm2/drm/drm_drv.c	25 Oct 2017 07:44:02 -0000
@@ -510,8 +510,12 @@
 static void	filt_drm_detach(struct knote *);
 static int	filt_drm_event(struct knote *, long);
 
-static const struct filterops drm_filtops =
-	{ 1, NULL, filt_drm_detach, filt_drm_event };
+static const struct filterops drm_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_drm_detach,
+	.f_event = filt_drm_event,
+};
 
 static int
 drm_kqfilter(struct file *fp, struct knote *kn)
Index: fs/smbfs/smbfs_kq.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_kq.c,v
retrieving revision 1.26
diff -u -r1.26 smbfs_kq.c
--- fs/smbfs/smbfs_kq.c	17 Oct 2013 21:04:44 -0000	1.26
+++ fs/smbfs/smbfs_kq.c	25 Oct 2017 07:44:05 -0000
@@ -409,10 +409,19 @@
 	return (kn->kn_fflags != 0);
 }
 
-static const struct filterops smbfsread_filtops =
-	{ 1, NULL, filt_smbfsdetach, filt_smbfsread };
-static const struct filterops smbfsvnode_filtops =
-	{ 1, NULL, filt_smbfsdetach, filt_smbfsvnode };
+static const struct filterops smbfsread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_smbfsdetach,
+	.f_event = filt_smbfsread,
+};
+
+static const struct filterops smbfsvnode_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_smbfsdetach,
+	.f_event = filt_smbfsvnode,
+};
 
 int
 smbfs_kqfilter(void *v)
Index: kern/kern_event.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_event.c,v
retrieving revision 1.95
diff -u -r1.95 kern_event.c
--- kern/kern_event.c	25 Oct 2017 06:02:40 -0000	1.95
+++ kern/kern_event.c	25 Oct 2017 07:44:05 -0000
@@ -119,14 +119,33 @@
 	.fo_restart = fnullop_restart,
 };
 
-static const struct filterops kqread_filtops =
-	{ 1, NULL, filt_kqdetach, filt_kqueue };
-static const struct filterops proc_filtops =
-	{ 0, filt_procattach, filt_procdetach, filt_proc };
-static const struct filterops file_filtops =
-	{ 1, filt_fileattach, NULL, NULL };
-static const struct filterops timer_filtops =
-	{ 0, filt_timerattach, filt_timerdetach, filt_timer };
+static const struct filterops kqread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_kqdetach,
+	.f_event = filt_kqueue,
+};
+
+static const struct filterops proc_filtops = {
+	.f_isfd = 0,
+	.f_attach = filt_procattach,
+	.f_detach = filt_procdetach,
+	.f_event = filt_proc,
+};
+
+static const struct filterops file_filtops = {
+	.f_isfd = 1,
+	.f_attach = filt_fileattach,
+	.f_detach = NULL,
+	.f_event = NULL,
+};
+
+static const struct filterops timer_filtops = {
+	.f_isfd = 0,
+	.f_attach = filt_timerattach,
+	.f_detach = filt_timerdetach,
+	.f_event = filt_timer,
+};
 
 static u_int	kq_ncallouts = 0;
 static int	kq_calloutmax = (4 * 1024);
@@ -729,8 +748,12 @@
 	/* Nothing to do */
 }
 
-const struct filterops seltrue_filtops =
-	{ 1, NULL, filt_seltruedetach, filt_seltrue };
+const struct filterops seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_seltruedetach,
+	.f_event = filt_seltrue,
+};
 
 int
 seltrue_kqfilter(dev_t dev, struct knote *kn)
Index: kern/kern_sig.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_sig.c,v
retrieving revision 1.337
diff -u -r1.337 kern_sig.c
--- kern/kern_sig.c	28 Aug 2017 00:46:07 -0000	1.337
+++ kern/kern_sig.c	25 Oct 2017 07:44:06 -0000
@@ -2328,5 +2328,8 @@
 }
 
 const struct filterops sig_filtops = {
-	0, filt_sigattach, filt_sigdetach, filt_signal
+		.f_isfd = 0,
+		.f_attach = filt_sigattach,
+		.f_detach = filt_sigdetach,
+		.f_event = filt_signal,
 };
Index: kern/subr_cprng.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_cprng.c,v
retrieving revision 1.27
diff -u -r1.27 subr_cprng.c
--- kern/subr_cprng.c	13 Apr 2015 22:43:41 -0000	1.27
+++ kern/subr_cprng.c	25 Oct 2017 07:44:06 -0000
@@ -256,8 +256,12 @@
 static void	filt_cprng_detach(struct knote *);
 static int	filt_cprng_event(struct knote *, long);
 
-static const struct filterops cprng_filtops =
-	{ 1, NULL, filt_cprng_detach, filt_cprng_event };
+static const struct filterops cprng_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_cprng_detach,
+	.f_event = filt_cprng_event,
+};
 
 int
 cprng_strong_kqfilter(struct cprng_strong *cprng, struct knote *kn)
Index: kern/subr_log.c
===================================================================
RCS file: /cvsroot/src/sys/kern/subr_log.c,v
retrieving revision 1.55
diff -u -r1.55 subr_log.c
--- kern/subr_log.c	20 May 2015 11:18:36 -0000	1.55
+++ kern/subr_log.c	25 Oct 2017 07:44:06 -0000
@@ -289,8 +289,12 @@
 	return rv;
 }
 
-static const struct filterops logread_filtops =
-	{ 1, NULL, filt_logrdetach, filt_logread };
+static const struct filterops logread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_logrdetach,
+	.f_event = filt_logread,
+};
 
 static int
 logkqfilter(dev_t dev, struct knote *kn)
Index: kern/sys_pipe.c
===================================================================
RCS file: /cvsroot/src/sys/kern/sys_pipe.c,v
retrieving revision 1.140
diff -u -r1.140 sys_pipe.c
--- kern/sys_pipe.c	5 Sep 2014 09:20:59 -0000	1.140
+++ kern/sys_pipe.c	25 Oct 2017 07:44:06 -0000
@@ -1446,10 +1446,19 @@
 	return (kn->kn_data >= PIPE_BUF);
 }
 
-static const struct filterops pipe_rfiltops =
-	{ 1, NULL, filt_pipedetach, filt_piperead };
-static const struct filterops pipe_wfiltops =
-	{ 1, NULL, filt_pipedetach, filt_pipewrite };
+static const struct filterops pipe_rfiltops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_pipedetach,
+	.f_event = filt_piperead,
+};
+
+static const struct filterops pipe_wfiltops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_pipedetach,
+	.f_event = filt_pipewrite,
+};
 
 static int
 pipe_kqfilter(file_t *fp, struct knote *kn)
Index: kern/tty.c
===================================================================
RCS file: /cvsroot/src/sys/kern/tty.c,v
retrieving revision 1.274
diff -u -r1.274 tty.c
--- kern/tty.c	1 Oct 2016 04:42:54 -0000	1.274
+++ kern/tty.c	25 Oct 2017 07:44:07 -0000
@@ -1516,10 +1516,19 @@
 	return (canwrite);
 }
 
-static const struct filterops ttyread_filtops =
-	{ 1, NULL, filt_ttyrdetach, filt_ttyread };
-static const struct filterops ttywrite_filtops =
-	{ 1, NULL, filt_ttywdetach, filt_ttywrite };
+static const struct filterops ttyread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ttyrdetach,
+	.f_event = filt_ttyread,
+};
+
+static const struct filterops ttywrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ttywdetach,
+	.f_event = filt_ttywrite,
+};
 
 int
 ttykqfilter(dev_t dev, struct knote *kn)
Index: kern/tty_pty.c
===================================================================
RCS file: /cvsroot/src/sys/kern/tty_pty.c,v
retrieving revision 1.142
diff -u -r1.142 tty_pty.c
--- kern/tty_pty.c	20 Aug 2015 09:45:45 -0000	1.142
+++ kern/tty_pty.c	25 Oct 2017 07:44:08 -0000
@@ -997,10 +997,19 @@
 	return canwrite;
 }
 
-static const struct filterops ptcread_filtops =
-	{ 1, NULL, filt_ptcrdetach, filt_ptcread };
-static const struct filterops ptcwrite_filtops =
-	{ 1, NULL, filt_ptcwdetach, filt_ptcwrite };
+static const struct filterops ptcread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ptcrdetach,
+	.f_event = filt_ptcread,
+};
+
+static const struct filterops ptcwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_ptcwdetach,
+	.f_event = filt_ptcwrite,
+};
 
 int
 ptckqfilter(dev_t dev, struct knote *kn)
Index: kern/uipc_socket.c
===================================================================
RCS file: /cvsroot/src/sys/kern/uipc_socket.c,v
retrieving revision 1.256
diff -u -r1.256 uipc_socket.c
--- kern/uipc_socket.c	6 Jul 2017 17:42:39 -0000	1.256
+++ kern/uipc_socket.c	25 Oct 2017 07:44:08 -0000
@@ -2319,12 +2319,26 @@
 	return rv;
 }
 
-static const struct filterops solisten_filtops =
-	{ 1, NULL, filt_sordetach, filt_solisten };
-static const struct filterops soread_filtops =
-	{ 1, NULL, filt_sordetach, filt_soread };
-static const struct filterops sowrite_filtops =
-	{ 1, NULL, filt_sowdetach, filt_sowrite };
+static const struct filterops solisten_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_sordetach,
+	.f_event = filt_solisten,
+};
+
+static const struct filterops soread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_sordetach,
+	.f_event = filt_soread,
+};
+
+static const struct filterops sowrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_sowdetach,
+	.f_event = filt_sowrite,
+};
 
 int
 soo_kqfilter(struct file *fp, struct knote *kn)
Index: miscfs/fifofs/fifo_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/fifofs/fifo_vnops.c,v
retrieving revision 1.78
diff -u -r1.78 fifo_vnops.c
--- miscfs/fifofs/fifo_vnops.c	11 Apr 2017 14:25:00 -0000	1.78
+++ miscfs/fifofs/fifo_vnops.c	25 Oct 2017 07:44:09 -0000
@@ -579,10 +579,19 @@
 	return rv;
 }
 
-static const struct filterops fiforead_filtops =
-	{ 1, NULL, filt_fifordetach, filt_fiforead };
-static const struct filterops fifowrite_filtops =
-	{ 1, NULL, filt_fifowdetach, filt_fifowrite };
+static const struct filterops fiforead_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_fifordetach,
+	.f_event = filt_fiforead,
+};
+
+static const struct filterops fifowrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_fifowdetach,
+	.f_event = filt_fifowrite,
+};
 
 /* ARGSUSED */
 static int
Index: miscfs/genfs/genfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/genfs/genfs_vnops.c,v
retrieving revision 1.198
diff -u -r1.198 genfs_vnops.c
--- miscfs/genfs/genfs_vnops.c	1 Jul 2017 20:07:00 -0000	1.198
+++ miscfs/genfs/genfs_vnops.c	25 Oct 2017 07:44:09 -0000
@@ -554,12 +554,26 @@
 	return (fflags != 0);
 }
 
-static const struct filterops genfsread_filtops =
-	{ 1, NULL, filt_genfsdetach, filt_genfsread };
-static const struct filterops genfswrite_filtops =
-	{ 1, NULL, filt_genfsdetach, filt_genfswrite };
-static const struct filterops genfsvnode_filtops =
-	{ 1, NULL, filt_genfsdetach, filt_genfsvnode };
+static const struct filterops genfsread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_genfsdetach,
+	.f_event = filt_genfsread,
+};
+
+static const struct filterops genfswrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_genfsdetach,
+	.f_event = filt_genfswrite,
+};
+
+static const struct filterops genfsvnode_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_genfsdetach,
+	.f_event = filt_genfsvnode,
+};
 
 int
 genfs_kqfilter(void *v)
Index: net/bpf.c
===================================================================
RCS file: /cvsroot/src/sys/net/bpf.c,v
retrieving revision 1.217
diff -u -r1.217 bpf.c
--- net/bpf.c	19 Oct 2017 01:57:15 -0000	1.217
+++ net/bpf.c	25 Oct 2017 07:44:10 -0000
@@ -1496,8 +1496,12 @@
 	return rv;
 }
 
-static const struct filterops bpfread_filtops =
-	{ 1, NULL, filt_bpfrdetach, filt_bpfread };
+static const struct filterops bpfread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_bpfrdetach,
+	.f_event = filt_bpfread,
+};
 
 static int
 bpf_kqfilter(struct file *fp, struct knote *kn)
Index: net/if_tun.c
===================================================================
RCS file: /cvsroot/src/sys/net/if_tun.c,v
retrieving revision 1.139
diff -u -r1.139 if_tun.c
--- net/if_tun.c	24 May 2017 06:52:14 -0000	1.139
+++ net/if_tun.c	25 Oct 2017 07:44:10 -0000
@@ -1063,11 +1063,19 @@
 	return 1;
 }
 
-static const struct filterops tunread_filtops =
-	{ 1, NULL, filt_tunrdetach, filt_tunread };
-
-static const struct filterops tun_seltrue_filtops =
-	{ 1, NULL, filt_tunrdetach, filt_seltrue };
+static const struct filterops tunread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_tunrdetach,
+	.f_event = filt_tunread,
+};
+
+static const struct filterops tun_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_tunrdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 tunkqfilter(dev_t dev, struct knote *kn)
Index: netisdn/i4b_i4bdrv.c
===================================================================
RCS file: /cvsroot/src/sys/netisdn/i4b_i4bdrv.c,v
retrieving revision 1.39
diff -u -r1.39 i4b_i4bdrv.c
--- netisdn/i4b_i4bdrv.c	25 Jul 2014 08:10:40 -0000	1.39
+++ netisdn/i4b_i4bdrv.c	25 Oct 2017 07:44:11 -0000
@@ -991,11 +991,19 @@
 	return (1);
 }
 
-static const struct filterops i4bread_filtops =
-	{ 1, NULL, filt_i4brdetach, filt_i4bread };
-
-static const struct filterops i4b_seltrue_filtops =
-	{ 1, NULL, filt_i4brdetach, filt_seltrue };
+static const struct filterops i4bread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4brdetach,
+	.f_event = filt_i4bread,
+};
+
+static const struct filterops i4b_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4brdetach,
+	.f_event = filt_seltrue,
+};
 
 int
 isdnkqfilter(dev_t dev, struct knote *kn)
Index: netisdn/i4b_rbch.c
===================================================================
RCS file: /cvsroot/src/sys/netisdn/i4b_rbch.c,v
retrieving revision 1.28
diff -u -r1.28 i4b_rbch.c
--- netisdn/i4b_rbch.c	25 Jul 2014 08:10:40 -0000	1.28
+++ netisdn/i4b_rbch.c	25 Oct 2017 07:44:11 -0000
@@ -842,8 +842,12 @@
 	return (1);
 }
 
-static const struct filterops i4brbchread_filtops =
-	{ 1, NULL, filt_i4brbchdetach, filt_i4brbchread };
+static const struct filterops i4brbchread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4brbchdetach,
+	.f_event = filt_i4brbchread,
+};
 
 static int
 filt_i4brbchwrite(struct knote *kn, long hint)
@@ -860,8 +864,12 @@
 	return (1);
 }
 
-static const struct filterops i4brbchwrite_filtops =
-	{ 1, NULL, filt_i4brbchdetach, filt_i4brbchwrite };
+static const struct filterops i4brbchwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4brbchdetach,
+	.f_event = filt_i4brbchwrite,
+};
 
 int
 isdnbchankqfilter(dev_t dev, struct knote *kn)
Index: netisdn/i4b_tel.c
===================================================================
RCS file: /cvsroot/src/sys/netisdn/i4b_tel.c,v
retrieving revision 1.27
diff -u -r1.27 i4b_tel.c
--- netisdn/i4b_tel.c	25 Jul 2014 08:10:40 -0000	1.27
+++ netisdn/i4b_tel.c	25 Oct 2017 07:44:12 -0000
@@ -984,8 +984,12 @@
 	return (1);
 }
 
-static const struct filterops i4btel_telread_filtops =
-	{ 1, NULL, filt_i4btel_detach, filt_i4btel_telread };
+static const struct filterops i4btel_telread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4btel_detach,
+	.f_event = filt_i4btel_telread,
+};
 
 static int
 filt_i4btel_telwrite(struct knote *kn, long hint)
@@ -1003,8 +1007,12 @@
 	return (1);
 }
 
-static const struct filterops i4btel_telwrite_filtops =
-	{ 1, NULL, filt_i4btel_detach, filt_i4btel_telwrite };
+static const struct filterops i4btel_telwrite_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4btel_detach,
+	.f_event = filt_i4btel_telwrite,
+};
 
 static int
 filt_i4btel_dialread(struct knote *kn, long hint)
@@ -1018,11 +1026,19 @@
 	return (1);
 }
 
-static const struct filterops i4btel_dialread_filtops =
-	{ 1, NULL, filt_i4btel_detach, filt_i4btel_dialread };
+static const struct filterops i4btel_dialread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4btel_detach,
+	.f_event = filt_i4btel_dialread,
+};
 
-static const struct filterops i4btel_seltrue_filtops =
-	{ 1, NULL, filt_i4btel_detach, filt_seltrue };
+static const struct filterops i4btel_seltrue_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_i4btel_detach,
+	.f_event = filt_seltrue,
+};
 
 int
 isdntelkqfilter(dev_t dev, struct knote *kn)
Index: nfs/nfs_kq.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_kq.c,v
retrieving revision 1.25
diff -u -r1.25 nfs_kq.c
--- nfs/nfs_kq.c	24 Oct 2011 11:43:30 -0000	1.25
+++ nfs/nfs_kq.c	25 Oct 2017 07:44:12 -0000
@@ -279,10 +279,19 @@
 }
 
 
-static const struct filterops nfsread_filtops =
-	{ 1, NULL, filt_nfsdetach, filt_nfsread };
-static const struct filterops nfsvnode_filtops =
-	{ 1, NULL, filt_nfsdetach, filt_nfsvnode };
+static const struct filterops nfsread_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_nfsdetach,
+	.f_event = filt_nfsread,
+};
+
+static const struct filterops nfsvnode_filtops = {
+	.f_isfd = 1,
+	.f_attach = NULL,
+	.f_detach = filt_nfsdetach,
+	.f_event = filt_nfsvnode,
+};
 
 int
 nfs_kqfilter(void *v)