Remove kernfs, okay deraadt@.

9 files changed, 7 insertions, 356 deletions

diff --git a/share/lkm/Makefile b/share/lkm/Makefile
index 2c53281dc74..d727fe73ec2 100644
--- a/share/lkm/Makefile
+++ b/share/lkm/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2005/09/27 16:27:23 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2005/11/24 12:08:15 pedro Exp $
 #
 #
 
-FILES=	README syscall vfs misc
+FILES=	README syscall misc
 NOOBJ=	noobj
 
 all clean cleandir depend lint tags:
diff --git a/share/lkm/vfs/Makefile b/share/lkm/vfs/Makefile
deleted file mode 100644
index cd651ba0e17..00000000000
--- a/share/lkm/vfs/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2000/03/02 14:46:39 todd Exp $
-#
-# Makefile for sample loadable file system
-#
-# 25 May 93	Terry Lambert		Original
-#
-# Copyright (c) 1993 Terrence R. Lambert.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by Terrence R. Lambert.
-# 4. The name Terrence R. Lambert may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TERRENCE R. LAMBERT ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE TERRENCE R. LAMBERT BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-
-SUBDIR=	module
-
-load: _SUBDIRUSE
-
-unload: _SUBDIRUSE
-
-.include <bsd.subdir.mk>
-
-#
-# EOF -- This file has not been truncated.
-#
diff --git a/share/lkm/vfs/README b/share/lkm/vfs/README
deleted file mode 100644
index f39e4e14dc3..00000000000
--- a/share/lkm/vfs/README
+++ /dev/null
@@ -1,98 +0,0 @@
-#	$OpenBSD: README,v 1.2 2000/03/02 14:46:39 todd Exp $
-#
-# Copyright (c) 1993 Terrence R. Lambert.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by Terrence R. Lambert.
-# 4. The name Terrence R. Lambert may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TERRENCE R. LAMBERT ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE TERRENCE R. LAMBERT BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-
-1.0	Overview
-
-	This is the README file for the sample loaded file system.
-
-
-2.0	Preparation
-
-	To use this module, you must have a kernel the does *NOT*
-	have an existing "kernfs" file system in it.  To determine
-	if your system has the "kernfs" file system in it, check
-	the build file for your kernel (usually this file is named
-	"/sys/i386/conf/GENERICISA") for the following:
-
-		options		KERNFS
-
-	By default, NetBSD has this file system compiled as part
-	of the kernel; if you wish to use this example with NetBSD
-	you will have to remove this "options" line and rebuild
-	your kernel.
-
-
-3.0	Directions
-
-	To test the module, do the following:
-
-		cd module
-		make load
-
-	A load message (the copyright) will be printed on the console.
-
-	You must then add the following line to the "/etc/fstab" file:
-
-		kernfs /kern kernfs rw 1 1
-
-	At the root prompt, type the following:
-
-		mkdir /kern
-
-	Ignore the following error if it occurs:
-
-		mkdir: /kern: File exists
-
-	Again at the root prompt, type the following command:
-
-		mount /kern
-		cd /kern
-		cat version
-
-	This will verify that the module is working correctly.
-
-
-4.0	Recovering resources
-
-	The file system consumes 8 pages of memory when loaded; it
-	can be freed up by unloading it.  To unload it, type the
-	following from the directory this file is in:
-
-		cd module
-		make unload
-
-	The file system will be unloaded by name.
-
-
-5.0	END OF DOCUMENT
diff --git a/share/lkm/vfs/module/Makefile b/share/lkm/vfs/module/Makefile
deleted file mode 100644
index ad71e65b057..00000000000
--- a/share/lkm/vfs/module/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-#	$OpenBSD: Makefile,v 1.7 2001/06/27 06:16:47 art Exp $
-#
-# Makefile for newsyscall
-#
-# 05 Jun 93	Terry Lambert		Original
-#
-# Copyright (c) 1993 Terrence R. Lambert.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#      This product includes software developed by Terrence R. Lambert.
-# 4. The name Terrence R. Lambert may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY TERRENCE R. LAMBERT ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE TERRENCE R. LAMBERT BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-
-SRCS=kernfsmod.c
-OBJS=$(SRCS:.c=.o)
-
-KSRCS=/sys/miscfs/kernfs/kernfs_vfsops.c /sys/miscfs/kernfs/kernfs_vnops.c
-KOBJS=kernfs_vfsops.o kernfs_vnops.o
-
-MODOBJ=combined.o
-
-KMOD=kernfsmod
-CFLAGS+= -D_KERNEL -I/sys -I.
-
-all:	$(MODOBJ)
-
-clean:
-	rm -f $(OBJS) $(KOBJS) $(MODOBJ) $(KMOD)
-
-load:
-	modload -o $(KMOD) -e$(KMOD) $(MODOBJ)
-
-unload:
-	modunload -n $(KMOD)
-
-kernfs_vfsops.o: /sys/miscfs/kernfs/kernfs_vfsops.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-kernfs_vnops.o: /sys/miscfs/kernfs/kernfs_vnops.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(MODOBJ): $(OBJS) $(KOBJS)
-	$(LD) -r -o $(MODOBJ) $(OBJS) $(KOBJS)
-
-.include <bsd.own.mk>
-
-#
-# EOF -- This file has not been truncated.
-#
diff --git a/share/lkm/vfs/module/kernfsmod.c b/share/lkm/vfs/module/kernfsmod.c
deleted file mode 100644
index 94acff63be5..00000000000
--- a/share/lkm/vfs/module/kernfsmod.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$OpenBSD: kernfsmod.c,v 1.4 2004/04/05 07:19:26 deraadt Exp $	*/
-/*
- * kernfsmod.c
- *
- * 05 Jun 93	Terry Lambert		Original
- *
- * Copyright (c) 1993 Terrence R. Lambert.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Terrence R. Lambert.
- * 4. The name Terrence R. Lambert may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TERRENCE R. LAMBERT ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE TERRENCE R. LAMBERT BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/mount.h>
-#include <sys/exec.h>
-#include <sys/lkm.h>
-#include <sys/file.h>
-#include <sys/errno.h>
-
-/*
- * This is the vfsops table from /sys/miscfs/kernfs/kernfs_vfsops.c
- */
-extern struct vfsops kernfs_vfsops;
-extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
-
-struct vfsconf kernfs_vfsconf = {
-	&kernfs_vfsops, MOUNT_KERNFS, 11, 0, 0, NULL, NULL
-};
-
-/*
- * XXX THE FOLLOWING COMMENT IS PROBABLY BOGUS...	- cgd, 12/24/94
- * Currently, the mount system call is broken in the way it operates
- * and the vfssw[] table does not have a character string identifier
- * for the file system type; therefore, to remount a file system after
- * it has been mounted in the first place, the offset into the table
- * must be the same; this will be corrected in future patches, but
- * not right now.  At the same time the fstab format will need to
- * change to allow definition without mount of file systems.
- *
- * The flags field is a parameter to the init; this could be used to
- * change the file system operation: for instance, in ISOFS, this
- * could be used to enable/disable Rockridge extensions.
- */
-MOD_VFS("kernfsmod", -1, &kernfs_vfsconf)
-
-/*
- * External entry point; should generally match name of .o file.  The
- * arguments are always the same for all loaded modules.  The "load",
- * "unload", and "stat" functions in "DISPATCH" will be called under
- * their respective circumstances.  If no function is desired, lkm_nofunc()
- * should be supplied.  They are called with the same arguments (cmd is
- * included to allow the use of a single function, ver is included for
- * version matching between modules and the kernel loader for the modules).
- *
- * Since we expect to link in the kernel and add external symbols to
- * the kernel symbol name space in a future version, generally all
- * functions used in the implementation of a particular module should
- * be static unless they are expected to be seen in other modules or
- * to resolve unresolved symbols already existing in the kernel (the
- * second case is not likely to ever occur).
- *
- * The entry point should return 0 unless it is refusing load (in which
- * case it should return an errno from errno.h).
- */
-int
-kernfsmod(lkmtp, cmd, ver)
-	struct lkm_table *lkmtp;	
-	int cmd;
-	int ver;
-{
-
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&kernfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&kernfs_vnodeop_opv_desc);
-
-	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
-}
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 96a19b986dc..9b293f8fd4d 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.65 2005/08/19 15:45:47 jmc Exp $
+.\" $OpenBSD: ipsec.4,v 1.66 2005/11/24 12:08:16 pedro Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -350,12 +350,6 @@ The system does guarantee that it will succeed at establishing the
 required security associations.
 In any case a properly configured key management daemon is required which
 listens to messages from the kernel.
-.Pp
-A list of all security associations in the kernel tables can be
-obtained via the kernfs file
-.Aq Pa ipsec ,
-typically in
-.Aq Pa /kern/ipsec .
 .Sh DIAGNOSTICS
 A socket operation may fail with one of the following errors returned:
 .Bl -tag -width [EINVAL]
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 69d18ea7097..d1584057a38 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.170 2005/11/13 03:27:41 krw Exp $
+.\"	$OpenBSD: options.4,v 1.171 2005/11/24 12:08:16 pedro Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
@@ -445,15 +445,6 @@ and on
 .Pa /dev/stdout ,
 and
 .Pa /dev/stderr .
-.It Cd option KERNFS
-Includes code which permits the mounting of a special file system
-(normally mounted on
-.Pa /kern )
-in which files representing various kernel variables and parameters
-may be found.
-See
-.Xr mount_kernfs 8
-for details.
 .It Cd option PORTAL
 Includes the (experimental) portal filesystem.
 This permits interesting tricks like opening TCP sockets by opening files in
@@ -1106,7 +1097,6 @@ is zero, the hardware realtime clock device is not in Daylight Saving Time.
 .Xr init 8 ,
 .Xr mount_cd9660 8 ,
 .Xr mount_fdesc 8 ,
-.Xr mount_kernfs 8 ,
 .Xr mount_mfs 8 ,
 .Xr mount_msdos 8 ,
 .Xr mount_nfs 8 ,
diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5
index 7001f68ecbc..07062f45945 100644
--- a/share/man/man5/fstab.5
+++ b/share/man/man5/fstab.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstab.5,v 1.31 2005/10/03 10:57:16 jmc Exp $
+.\"	$OpenBSD: fstab.5,v 1.32 2005/11/24 12:08:16 pedro Exp $
 .\"	$NetBSD: fstab.5,v 1.5.2.1 1995/11/16 20:11:11 pk Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -109,8 +109,6 @@ filesystem.
 .It ext2fs
 A local Linux compatible ext2fs
 filesystem.
-.It kernfs
-Various and sundry kernel statistics.
 .It mfs
 A local memory-based
 .Ux
diff --git a/share/man/man9/getdevvp.9 b/share/man/man9/getdevvp.9
index f3975677f69..a796c9c5b5c 100644
--- a/share/man/man9/getdevvp.9
+++ b/share/man/man9/getdevvp.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: getdevvp.9,v 1.5 2004/08/21 00:02:25 jmc Exp $
+.\"     $OpenBSD: getdevvp.9,v 1.6 2005/11/24 12:08:16 pedro Exp $
 .\"
 .\" Copyright (C) 2002 Peter A. Werner. All rights reserved.
 .\"
@@ -77,8 +77,7 @@ use getdevvp internally, specifying the third argument.
 will create a vnode for a block device, and is used for the root file system
 and swap areas, among other things.
 .Fn cdevvp
-will create a vnode for a character device and is used in kernfs and in some
-console handling.
+will create a vnode for a character device and is used in console handling.
 .Sh RETURN VALUES
 All functions return 0 on success.
 If an error occurs, vpp will point to a NULLVP.