Module Name: src
Committed By: christos
Date: Thu Nov 30 20:25:56 UTC 2017
Modified Files:
src/sys/arch/xen/xen: xenevt.c
src/sys/compat/svr4: svr4_net.c
src/sys/compat/svr4_32: svr4_32_net.c
src/sys/dev: audio.c rndpseudo.c
src/sys/dev/dmover: dmover_io.c
src/sys/dev/dtv: dtv_demux.c
src/sys/dev/filemon: filemon.c
src/sys/dev/iscsi: iscsi_main.c
src/sys/dev/pad: pad.c
src/sys/dev/putter: putter.c
src/sys/external/bsd/drm2/drm: drm_drv.c
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_arm.c
src/sys/kern: kern_drvctl.c kern_event.c sys_mqueue.c sys_pipe.c
sys_socket.c uipc_sem.c vfs_vnops.c
src/sys/net: bpf.c if_tap.c
src/sys/opencrypto: cryptodev.c
src/sys/rump/librump/rumpkern: cons.c
src/sys/sys: file.h
Log Message:
add fo_name so we can identify the fileops in a simple way.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/xen/xen/xenevt.c
cvs rdiff -u -r1.61 -r1.62 src/sys/compat/svr4/svr4_net.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/svr4_32/svr4_32_net.c
cvs rdiff -u -r1.441 -r1.442 src/sys/dev/audio.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/rndpseudo.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/dmover/dmover_io.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/dtv/dtv_demux.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/filemon/filemon.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/iscsi/iscsi_main.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/putter/putter.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/drm2/drm/drm_drv.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.100 -r1.101 src/sys/kern/kern_event.c
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/sys_mqueue.c
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/sys_pipe.c
cvs rdiff -u -r1.75 -r1.76 src/sys/kern/sys_socket.c
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/uipc_sem.c
cvs rdiff -u -r1.196 -r1.197 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.219 -r1.220 src/sys/net/bpf.c
cvs rdiff -u -r1.103 -r1.104 src/sys/net/if_tap.c
cvs rdiff -u -r1.96 -r1.97 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/librump/rumpkern/cons.c
cvs rdiff -u -r1.82 -r1.83 src/sys/sys/file.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.47 src/sys/arch/xen/xen/xenevt.c:1.48
--- src/sys/arch/xen/xen/xenevt.c:1.47 Sun Jul 16 10:02:48 2017
+++ src/sys/arch/xen/xen/xenevt.c Thu Nov 30 15:25:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.47 2017/07/16 14:02:48 cherry Exp $ */
+/* $NetBSD: xenevt.c,v 1.48 2017/11/30 20:25:54 christos Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.47 2017/07/16 14:02:48 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.48 2017/11/30 20:25:54 christos Exp $");
#include "opt_xen.h"
#include <sys/param.h>
@@ -74,6 +74,7 @@ static int xenevt_fclose(struct file *);
/* static int xenevt_fkqfilter(struct file *, struct knote *); */
static const struct fileops xenevt_fileops = {
+ .fo_name = "xenevt",
.fo_read = xenevt_fread,
.fo_write = xenevt_fwrite,
.fo_ioctl = xenevt_fioctl,
Index: src/sys/compat/svr4/svr4_net.c
diff -u src/sys/compat/svr4/svr4_net.c:1.61 src/sys/compat/svr4/svr4_net.c:1.62
--- src/sys/compat/svr4/svr4_net.c:1.61 Fri Sep 5 05:21:55 2014
+++ src/sys/compat/svr4/svr4_net.c Thu Nov 30 15:25:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_net.c,v 1.61 2014/09/05 09:21:55 matt Exp $ */
+/* $NetBSD: svr4_net.c,v 1.62 2017/11/30 20:25:54 christos Exp $ */
/*-
* Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.61 2014/09/05 09:21:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_net.c,v 1.62 2017/11/30 20:25:54 christos Exp $");
#define COMPAT_SVR4 1
@@ -110,6 +110,7 @@ int svr4_netattach(int);
int svr4_soo_close(file_t *);
static const struct fileops svr4_netops = {
+ .fo_name = "srv4_net",
.fo_read = soo_read,
.fo_write = soo_write,
.fo_ioctl = soo_ioctl,
Index: src/sys/compat/svr4_32/svr4_32_net.c
diff -u src/sys/compat/svr4_32/svr4_32_net.c:1.22 src/sys/compat/svr4_32/svr4_32_net.c:1.23
--- src/sys/compat/svr4_32/svr4_32_net.c:1.22 Fri Sep 5 05:21:55 2014
+++ src/sys/compat/svr4_32/svr4_32_net.c Thu Nov 30 15:25:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_net.c,v 1.22 2014/09/05 09:21:55 matt Exp $ */
+/* $NetBSD: svr4_32_net.c,v 1.23 2017/11/30 20:25:54 christos Exp $ */
/*-
* Copyright (c) 1994, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.22 2014/09/05 09:21:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_net.c,v 1.23 2017/11/30 20:25:54 christos Exp $");
#define COMPAT_SVR4 1
@@ -95,6 +95,7 @@ int svr4_soo_close(file_t *);
int svr4_ptm_alloc(struct proc *);
static const struct fileops svr4_32_netops = {
+ .fo_read = "svr4_32_net",
.fo_read = soo_read,
.fo_write = soo_write,
.fo_ioctl = soo_ioctl,
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.441 src/sys/dev/audio.c:1.442
--- src/sys/dev/audio.c:1.441 Tue Nov 28 02:35:27 2017
+++ src/sys/dev/audio.c Thu Nov 30 15:25:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.441 2017/11/28 07:35:27 nat Exp $ */
+/* $NetBSD: audio.c,v 1.442 2017/11/30 20:25:54 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <nathanialsl...@yahoo.com.au>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.441 2017/11/28 07:35:27 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.442 2017/11/30 20:25:54 christos Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -437,6 +437,7 @@ const struct cdevsw audio_cdevsw = {
};
const struct fileops audio_fileops = {
+ .fo_name = "audio",
.fo_read = audioread,
.fo_write = audiowrite,
.fo_ioctl = audioioctl,
Index: src/sys/dev/rndpseudo.c
diff -u src/sys/dev/rndpseudo.c:1.35 src/sys/dev/rndpseudo.c:1.36
--- src/sys/dev/rndpseudo.c:1.35 Thu Aug 20 10:40:17 2015
+++ src/sys/dev/rndpseudo.c Thu Nov 30 15:25:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: rndpseudo.c,v 1.36 2017/11/30 20:25:54 christos Exp $ */
/*-
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.35 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpseudo.c,v 1.36 2017/11/30 20:25:54 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -133,6 +133,7 @@ static int rnd_close(struct file *);
static int rnd_kqfilter(struct file *, struct knote *);
const struct fileops rnd_fileops = {
+ .fo_name = "rnd",
.fo_read = rnd_read,
.fo_write = rnd_write,
.fo_ioctl = rnd_ioctl,
Index: src/sys/dev/dmover/dmover_io.c
diff -u src/sys/dev/dmover/dmover_io.c:1.44 src/sys/dev/dmover/dmover_io.c:1.45
--- src/sys/dev/dmover/dmover_io.c:1.44 Thu Aug 20 10:40:17 2015
+++ src/sys/dev/dmover/dmover_io.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $ */
+/* $NetBSD: dmover_io.c,v 1.45 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.44 2015/08/20 14:40:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.45 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -766,6 +766,7 @@ dmio_close(struct file *fp)
}
static const struct fileops dmio_fileops = {
+ .fo_name = "dmio",
.fo_read = dmio_read,
.fo_write = dmio_write,
.fo_ioctl = dmio_ioctl,
Index: src/sys/dev/dtv/dtv_demux.c
diff -u src/sys/dev/dtv/dtv_demux.c:1.7 src/sys/dev/dtv/dtv_demux.c:1.8
--- src/sys/dev/dtv/dtv_demux.c:1.7 Wed May 31 22:45:10 2017
+++ src/sys/dev/dtv/dtv_demux.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_demux.c,v 1.7 2017/06/01 02:45:10 chs Exp $ */
+/* $NetBSD: dtv_demux.c,v 1.8 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtv_demux.c,v 1.7 2017/06/01 02:45:10 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtv_demux.c,v 1.8 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -75,6 +75,7 @@ static int dtv_demux_poll(struct file *,
static int dtv_demux_close(struct file *);
static const struct fileops dtv_demux_fileops = {
+ .fo_name = "dtv_demux",
.fo_read = dtv_demux_read,
.fo_write = fbadop_write,
.fo_ioctl = dtv_demux_ioctl,
Index: src/sys/dev/filemon/filemon.c
diff -u src/sys/dev/filemon/filemon.c:1.28 src/sys/dev/filemon/filemon.c:1.29
--- src/sys/dev/filemon/filemon.c:1.28 Sun Jan 10 20:37:36 2016
+++ src/sys/dev/filemon/filemon.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.c,v 1.28 2016/01/11 01:37:36 pgoyette Exp $ */
+/* $NetBSD: filemon.c,v 1.29 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.28 2016/01/11 01:37:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filemon.c,v 1.29 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -70,6 +70,7 @@ static int filemon_ioctl(struct file *,
static int filemon_close(struct file *);
static const struct fileops filemon_fileops = {
+ .fo_name = "filemon",
.fo_ioctl = filemon_ioctl,
.fo_close = filemon_close,
.fo_read = fbadop_read,
Index: src/sys/dev/iscsi/iscsi_main.c
diff -u src/sys/dev/iscsi/iscsi_main.c:1.24 src/sys/dev/iscsi/iscsi_main.c:1.25
--- src/sys/dev/iscsi/iscsi_main.c:1.24 Sun Dec 25 01:55:28 2016
+++ src/sys/dev/iscsi/iscsi_main.c Thu Nov 30 15:25:55 2017
@@ -85,6 +85,7 @@ static dev_type_open(iscsiopen);
static int iscsiclose(struct file *);
static const struct fileops iscsi_fileops = {
+ .fo_name = "iscsi",
.fo_ioctl = iscsiioctl,
.fo_close = iscsiclose,
};
Index: src/sys/dev/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.42 src/sys/dev/pad/pad.c:1.43
--- src/sys/dev/pad/pad.c:1.42 Sat Jul 29 20:50:52 2017
+++ src/sys/dev/pad/pad.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.42 2017/07/30 00:50:52 nat Exp $ */
+/* $NetBSD: pad.c,v 1.43 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.42 2017/07/30 00:50:52 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.43 2017/11/30 20:25:55 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -172,6 +172,7 @@ const struct cdevsw pad_cdevsw = {
};
const struct fileops pad_fileops = {
+ .fo_name = "pad",
.fo_read = fops_pad_read,
.fo_write = pad_write,
.fo_ioctl = pad_ioctl,
Index: src/sys/dev/putter/putter.c
diff -u src/sys/dev/putter/putter.c:1.36 src/sys/dev/putter/putter.c:1.37
--- src/sys/dev/putter/putter.c:1.36 Wed Oct 25 04:12:38 2017
+++ src/sys/dev/putter/putter.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: putter.c,v 1.36 2017/10/25 08:12:38 maya Exp $ */
+/* $NetBSD: putter.c,v 1.37 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.36 2017/10/25 08:12:38 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: putter.c,v 1.37 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,6 +207,7 @@ static int putter_fop_kqfilter(file_t *,
static const struct fileops putter_fileops = {
+ .fo_name = "putter",
.fo_read = putter_fop_read,
.fo_write = putter_fop_write,
.fo_ioctl = putter_fop_ioctl,
Index: src/sys/external/bsd/drm2/drm/drm_drv.c
diff -u src/sys/external/bsd/drm2/drm/drm_drv.c:1.18 src/sys/external/bsd/drm2/drm/drm_drv.c:1.19
--- src/sys/external/bsd/drm2/drm/drm_drv.c:1.18 Wed Oct 25 04:12:39 2017
+++ src/sys/external/bsd/drm2/drm/drm_drv.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_drv.c,v 1.18 2017/10/25 08:12:39 maya Exp $ */
+/* $NetBSD: drm_drv.c,v 1.19 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.18 2017/10/25 08:12:39 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.19 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -238,6 +238,7 @@ const struct cdevsw drm_cdevsw = {
};
static const struct fileops drm_fileops = {
+ .fo_name = "drm",
.fo_read = drm_read,
.fo_write = fbadop_write,
.fo_ioctl = drm_ioctl,
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.18 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.19
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c:1.18 Thu Jan 12 00:41:25 2017
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_arm.c Thu Nov 30 15:25:55 2017
@@ -204,6 +204,7 @@ static int vchiq_close(struct file *);
static int vchiq_read(struct file *, off_t *, struct uio *, kauth_cred_t, int);
static const struct fileops vchiq_fileops = {
+ .fo_name = "vchiq",
.fo_read = vchiq_read,
.fo_write = fbadop_write,
.fo_ioctl = vchiq_ioctl,
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.42 src/sys/kern/kern_drvctl.c:1.43
--- src/sys/kern/kern_drvctl.c:1.42 Wed May 31 22:45:13 2017
+++ src/sys/kern/kern_drvctl.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.43 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.42 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.43 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,6 +93,7 @@ static int drvctl_stat(struct file *, st
static int drvctl_close(struct file *);
static const struct fileops drvctl_fileops = {
+ .fo_name = "drvctl",
.fo_read = drvctl_read,
.fo_write = drvctl_write,
.fo_ioctl = drvctl_ioctl,
Index: src/sys/kern/kern_event.c
diff -u src/sys/kern/kern_event.c:1.100 src/sys/kern/kern_event.c:1.101
--- src/sys/kern/kern_event.c:1.100 Thu Nov 30 09:19:27 2017
+++ src/sys/kern/kern_event.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_event.c,v 1.100 2017/11/30 14:19:27 christos Exp $ */
+/* $NetBSD: kern_event.c,v 1.101 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.100 2017/11/30 14:19:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.101 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,6 +108,7 @@ static void filt_timerdetach(struct knot
static int filt_timer(struct knote *, long hint);
static const struct fileops kqueueops = {
+ .fo_name = "kqueue",
.fo_read = (void *)enxio,
.fo_write = (void *)enxio,
.fo_ioctl = kqueue_ioctl,
@@ -1064,10 +1065,11 @@ kqueue_register(struct kqueue *kq, struc
KERNEL_UNLOCK_ONE(NULL); /* XXXSMP */
if (error != 0) {
#ifdef DEBUG
- printf("%s: event type %d not supported for "
- "file type %d (error %d)\n", __func__,
- kn->kn_filter, kn->kn_obj ?
- ((file_t *)kn->kn_obj)->f_type : -1, error);
+ const file_t *ft = kn->kn_obj;
+ uprintf("%s: event type %d not supported for "
+ "file type %d/%s (error %d)\n", __func__,
+ kn->kn_filter, ft ? ft->f_type : -1,
+ ft ? ft->f_ops->fo_name : "?", error);
#endif
/* knote_detach() drops fdp->fd_lock */
Index: src/sys/kern/sys_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.39 src/sys/kern/sys_mqueue.c:1.40
--- src/sys/kern/sys_mqueue.c:1.39 Mon Jun 29 11:44:45 2015
+++ src/sys/kern/sys_mqueue.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_mqueue.c,v 1.39 2015/06/29 15:44:45 christos Exp $ */
+/* $NetBSD: sys_mqueue.c,v 1.40 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2007-2011 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.39 2015/06/29 15:44:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.40 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -91,6 +91,7 @@ static int mq_stat_fop(file_t *, struct
static int mq_close_fop(file_t *);
static const struct fileops mqops = {
+ .fo_name = "mq",
.fo_read = fbadop_read,
.fo_write = fbadop_write,
.fo_ioctl = fbadop_ioctl,
Index: src/sys/kern/sys_pipe.c
diff -u src/sys/kern/sys_pipe.c:1.141 src/sys/kern/sys_pipe.c:1.142
--- src/sys/kern/sys_pipe.c:1.141 Wed Oct 25 04:12:39 2017
+++ src/sys/kern/sys_pipe.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_pipe.c,v 1.141 2017/10/25 08:12:39 maya Exp $ */
+/* $NetBSD: sys_pipe.c,v 1.142 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.141 2017/10/25 08:12:39 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_pipe.c,v 1.142 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,6 +112,7 @@ static int pipe_ioctl(file_t *, u_long,
static void pipe_restart(file_t *);
static const struct fileops pipeops = {
+ .fo_name = "pipe",
.fo_read = pipe_read,
.fo_write = pipe_write,
.fo_ioctl = pipe_ioctl,
Index: src/sys/kern/sys_socket.c
diff -u src/sys/kern/sys_socket.c:1.75 src/sys/kern/sys_socket.c:1.76
--- src/sys/kern/sys_socket.c:1.75 Tue Nov 21 22:03:18 2017
+++ src/sys/kern/sys_socket.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_socket.c,v 1.75 2017/11/22 03:03:18 ozaki-r Exp $ */
+/* $NetBSD: sys_socket.c,v 1.76 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.75 2017/11/22 03:03:18 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.76 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: sys_socket.c
#include <net/route.h>
const struct fileops socketops = {
+ .fo_name = "socket",
.fo_read = soo_read,
.fo_write = soo_write,
.fo_ioctl = soo_ioctl,
Index: src/sys/kern/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.47 src/sys/kern/uipc_sem.c:1.48
--- src/sys/kern/uipc_sem.c:1.47 Mon Oct 31 11:08:45 2016
+++ src/sys/kern/uipc_sem.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_sem.c,v 1.47 2016/10/31 15:08:45 maxv Exp $ */
+/* $NetBSD: uipc_sem.c,v 1.48 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.47 2016/10/31 15:08:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.48 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -106,6 +106,7 @@ static int ksem_read_fop(file_t *, off_
kauth_cred_t, int);
static const struct fileops semops = {
+ .fo_name = "sem",
.fo_read = ksem_read_fop,
.fo_write = fbadop_write,
.fo_ioctl = fbadop_ioctl,
Index: src/sys/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.196 src/sys/kern/vfs_vnops.c:1.197
--- src/sys/kern/vfs_vnops.c:1.196 Thu Nov 9 15:30:01 2017
+++ src/sys/kern/vfs_vnops.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnops.c,v 1.196 2017/11/09 20:30:01 christos Exp $ */
+/* $NetBSD: vfs_vnops.c,v 1.197 2017/11/30 20:25:55 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.196 2017/11/09 20:30:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.197 2017/11/30 20:25:55 christos Exp $");
#include "veriexec.h"
@@ -123,6 +123,7 @@ static int vn_mmap(struct file *, off_t
struct uvm_object **, int *);
const struct fileops vnops = {
+ .fo_name = "vn",
.fo_read = vn_read,
.fo_write = vn_write,
.fo_ioctl = vn_ioctl,
Index: src/sys/net/bpf.c
diff -u src/sys/net/bpf.c:1.219 src/sys/net/bpf.c:1.220
--- src/sys/net/bpf.c:1.219 Fri Nov 17 02:37:12 2017
+++ src/sys/net/bpf.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.219 2017/11/17 07:37:12 ozaki-r Exp $ */
+/* $NetBSD: bpf.c,v 1.220 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.219 2017/11/17 07:37:12 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.220 2017/11/30 20:25:55 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -271,6 +271,7 @@ static int bpf_kqfilter(struct file *, s
static void bpf_softintr(void *);
static const struct fileops bpf_fileops = {
+ .fo_name = "bpf",
.fo_read = bpf_read,
.fo_write = bpf_write,
.fo_ioctl = bpf_ioctl,
Index: src/sys/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.103 src/sys/net/if_tap.c:1.104
--- src/sys/net/if_tap.c:1.103 Wed Nov 29 14:27:52 2017
+++ src/sys/net/if_tap.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.103 2017/11/29 19:27:52 jmcneill Exp $ */
+/* $NetBSD: if_tap.c,v 1.104 2017/11/30 20:25:55 christos Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.103 2017/11/29 19:27:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.104 2017/11/30 20:25:55 christos Exp $");
#if defined(_KERNEL_OPT)
@@ -148,6 +148,7 @@ static int tap_fops_stat(file_t *, struc
static int tap_fops_kqfilter(file_t *, struct knote *);
static const struct fileops tap_fileops = {
+ .fo_name = "tap",
.fo_read = tap_fops_read,
.fo_write = tap_fops_write,
.fo_ioctl = tap_fops_ioctl,
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.96 src/sys/opencrypto/cryptodev.c:1.97
--- src/sys/opencrypto/cryptodev.c:1.96 Tue Nov 14 09:29:33 2017
+++ src/sys/opencrypto/cryptodev.c Thu Nov 30 15:25:55 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.96 2017/11/14 14:29:33 christos Exp $ */
+/* $NetBSD: cryptodev.c,v 1.97 2017/11/30 20:25:55 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.96 2017/11/14 14:29:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.97 2017/11/30 20:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,6 +160,7 @@ static int cryptof_poll(struct file *,
static int cryptof_stat(struct file *, struct stat *);
static const struct fileops cryptofops = {
+ .fo_name = "cryptof",
.fo_read = cryptof_read,
.fo_write = cryptof_write,
.fo_ioctl = cryptof_ioctl,
Index: src/sys/rump/librump/rumpkern/cons.c
diff -u src/sys/rump/librump/rumpkern/cons.c:1.6 src/sys/rump/librump/rumpkern/cons.c:1.7
--- src/sys/rump/librump/rumpkern/cons.c:1.6 Tue Jan 26 18:12:17 2016
+++ src/sys/rump/librump/rumpkern/cons.c Thu Nov 30 15:25:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.6 2016/01/26 23:12:17 pooka Exp $ */
+/* $NetBSD: cons.c,v 1.7 2017/11/30 20:25:56 christos Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.6 2016/01/26 23:12:17 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.7 2017/11/30 20:25:56 christos Exp $");
#include <sys/param.h>
#include <sys/file.h>
@@ -60,6 +60,7 @@ static int rumpcons_stat(struct file *,
static int rumpcons_poll(struct file *, int events);
static const struct fileops rumpcons_fileops = {
+ .fo_name = "rumpcons",
.fo_read = (void *)nullop,
.fo_write = rumpcons_write,
.fo_ioctl = rumpcons_ioctl,
Index: src/sys/sys/file.h
diff -u src/sys/sys/file.h:1.82 src/sys/sys/file.h:1.83
--- src/sys/sys/file.h:1.82 Sat Jul 1 19:31:19 2017
+++ src/sys/sys/file.h Thu Nov 30 15:25:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: file.h,v 1.82 2017/07/01 23:31:19 nat Exp $ */
+/* $NetBSD: file.h,v 1.83 2017/11/30 20:25:56 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -80,6 +80,7 @@ struct knote;
struct uvm_object;
struct fileops {
+ const char *fo_name;
int (*fo_read) (struct file *, off_t *, struct uio *,
kauth_cred_t, int);
int (*fo_write) (struct file *, off_t *, struct uio *,
