Delete procfs; it's always had races and is now unused: no one noticed for

months that I broke it before the 5.5 release.

confirmed as not being required by ports by sthen@, ajacoutot@, dcoppa@

13 files changed, 20 insertions, 62 deletions

diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h
index e5812471d4a..43b535eb86a 100644
--- a/sys/arch/alpha/include/reg.h
+++ b/sys/arch/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: reg.h,v 1.7 2014/09/08 01:47:05 guenther Exp $	*/
 /*	$NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 /*
- * Struct reg, used for procfs and in signal contexts
+ * Struct reg, used for ptrace and in signal contexts
  * Note that in signal contexts, it's represented as an array.
  * That array has to look exactly like 'struct reg' though.
  */
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index bf1b228af03..43c191480be 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.784 2014/08/20 06:14:42 mikeb Exp $
+#	$OpenBSD: GENERIC,v 1.785 2014/09/08 01:47:05 guenther Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -26,7 +26,6 @@ option		MTRR		# CPU memory range attributes control
 
 option		COMPAT_LINUX	# binary compatibility with Linux
 
-#option		PROCFS		# /proc, currently broken
 #option		GPT		# GPT partition table support
 option		NTFS		# NTFS support
 option		HIBERNATE	# Hibernate support
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 164bcf6081b..c596d834231 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.217 2014/07/11 21:54:37 tedu Exp $
+#	$OpenBSD: files.i386,v 1.218 2014/09/08 01:47:05 guenther Exp $
 #
 # new style config file for i386 architecture
 #
@@ -37,7 +37,6 @@ file	arch/i386/i386/powernow-k7.c	!small_kernel
 file	arch/i386/i386/powernow-k8.c	!small_kernel
 file	arch/i386/i386/k1x-pstate.c	!small_kernel
 file	arch/i386/i386/process_machdep.c
-file	arch/i386/i386/procfs_machdep.c	procfs
 file	arch/i386/i386/sys_machdep.c
 file	arch/i386/i386/trap.c
 file	arch/i386/i386/vm_machdep.c
diff --git a/sys/arch/powerpc/include/reg.h b/sys/arch/powerpc/include/reg.h
index e7bebf3ee15..ec9a64eda42 100644
--- a/sys/arch/powerpc/include/reg.h
+++ b/sys/arch/powerpc/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.10 2006/05/16 08:00:33 kettenis Exp $	*/
+/*	$OpenBSD: reg.h,v 1.11 2014/09/08 01:47:06 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 #define _POWERPC_REG_H_
 
 /*
- * Struct reg, used for procfs and in signal contexts
+ * Struct reg, used for ptrace and in signal contexts
  * Note that in signal contexts, it's represented as an array.
  * That array has to look exactly like 'struct reg' though.
  */
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 48e6556c73a..bf37e3d101f 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_misc.c,v 1.90 2014/06/28 21:20:19 matthew Exp $	*/
+/*	$OpenBSD: linux_misc.c,v 1.91 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $	*/
 
 /*-
@@ -416,8 +416,6 @@ bsd_to_linux_statfs(const struct statfs *bsp, struct linux_statfs *lsp)
 		lsp->l_ftype = LINUX_FSTYPE_NFS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_MSDOS))
 		lsp->l_ftype = LINUX_FSTYPE_MSDOS;
-	else if (!strcmp(bsp->f_fstypename, MOUNT_PROCFS))
-		lsp->l_ftype = LINUX_FSTYPE_PROCFS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_EXT2FS))
 		lsp->l_ftype = LINUX_FSTYPE_EXT2FS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_CD9660))
@@ -498,8 +496,6 @@ bsd_to_linux_statfs64(const struct statfs *bsp, struct linux_statfs64 *lsp)
 		lsp->l_ftype = LINUX_FSTYPE_NFS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_MSDOS))
 		lsp->l_ftype = LINUX_FSTYPE_MSDOS;
-	else if (!strcmp(bsp->f_fstypename, MOUNT_PROCFS))
-		lsp->l_ftype = LINUX_FSTYPE_PROCFS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_EXT2FS))
 		lsp->l_ftype = LINUX_FSTYPE_EXT2FS;
 	else if (!strcmp(bsp->f_fstypename, MOUNT_CD9660))
diff --git a/sys/compat/linux/linux_types.h b/sys/compat/linux/linux_types.h
index 9f477c780c4..b8e6798b390 100644
--- a/sys/compat/linux/linux_types.h
+++ b/sys/compat/linux/linux_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_types.h,v 1.13 2013/10/25 04:51:39 guenther Exp $	*/
+/*	$OpenBSD: linux_types.h,v 1.14 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: linux_types.h,v 1.5 1996/05/20 01:59:28 fvdl Exp $	*/
 
 /*
@@ -60,7 +60,6 @@ typedef int linux_pid_t;
 #define LINUX_FSTYPE_FFS	0x11954
 #define LINUX_FSTYPE_NFS	0x6969
 #define LINUX_FSTYPE_MSDOS	0x4d44
-#define LINUX_FSTYPE_PROCFS	0x9fa0
 #define LINUX_FSTYPE_EXT2FS	0xef53
 #define LINUX_FSTYPE_CD9660	0x9660
 #define LINUX_FSTYPE_NCPFS	0x6969
diff --git a/sys/kern/Makefile b/sys/kern/Makefile
index d907fbf555e..8a4c0bf1984 100644
--- a/sys/kern/Makefile
+++ b/sys/kern/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2014/03/18 22:36:37 miod Exp $
+#	$OpenBSD: Makefile,v 1.38 2014/09/08 01:47:06 guenther Exp $
 
 # Makefile for kernel tags files, init_sysent, etc.
 
@@ -38,7 +38,7 @@ DGEN=	compat compat/common \
 	kern \
 	lib/libkern lib/libkern/arch/${MACHINE} \
 	lib/libkern/arch/${MACHINE_ARCH} \
-	miscfs miscfs/deadfs miscfs/fifofs miscfs/procfs \
+	miscfs miscfs/deadfs miscfs/fifofs \
 	msdosfs \
 	net netinet netmpls \
 	nfs \
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 5751a840085..0fbe007a905 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.144 2014/07/12 18:43:32 tedu Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.145 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -473,7 +473,7 @@ sys_execve(struct proc *p, void *v, register_t *retval)
 	bcopy(nid.ni_cnd.cn_nameptr, p->p_comm, len);
 	pr->ps_acflag &= ~AFORK;
 
-	/* record proc's vnode, for use by procfs and others */
+	/* record proc's vnode, for use by sysctl */
 	otvp = pr->ps_textvp;
 	vref(pack.ep_vp);
 	pr->ps_textvp = pack.ep_vp;
@@ -537,17 +537,6 @@ sys_execve(struct proc *p, void *v, register_t *retval)
 			 * shared because we're suid.
 			 */
 			fp = fd_getfile(p->p_fd, i);
-#ifdef PROCFS
-			/*
-			 * Close descriptors that are writing to procfs.
-			 */
-			if (fp && fp->f_type == DTYPE_VNODE &&
-			    ((struct vnode *)(fp->f_data))->v_tag == VT_PROCFS &&
-			    (fp->f_flag & FWRITE)) {
-				fdrelease(p, i);
-				fp = NULL;
-			}
-#endif
 
 			/*
 			 * Ensure that stdin, stdout, and stderr are already
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 3efa176192b..d2adc0bb900 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.173 2014/07/13 15:46:21 uebayasi Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.174 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -183,7 +183,7 @@ process_new(struct proc *p, struct process *parent, int flags)
 	KASSERT(p->p_ucred->cr_ref >= 3); /* fork thr, new thr, new process */
 	pr->ps_limit->p_refcnt++;
 
-	/* bump references to the text vnode (for procfs) */
+	/* bump references to the text vnode (for sysctl) */
 	pr->ps_textvp = parent->ps_textvp;
 	if (pr->ps_textvp)
 		vref(pr->ps_textvp);
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 4bd359710e3..c4af4b7a47e 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_process.c,v 1.64 2014/07/13 15:00:40 tedu Exp $	*/
+/*	$OpenBSD: sys_process.c,v 1.65 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $	*/
 
 /*-
@@ -528,7 +528,7 @@ sys_ptrace(struct proc *p, void *v, register_t *retval)
 
 	case  PT_ATTACH:
 		/*
-		 * As done in procfs:
+		 * As was done in procfs:
 		 * Go ahead and set the trace flag.
 		 * Save the old parent (it's reset in
 		 *   _DETACH, and also in kern_exit.c:wait4()
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index aeda674d837..dd2afbbb810 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_init.c,v 1.33 2013/09/24 09:20:12 espie Exp $	*/
+/*	$OpenBSD: vfs_init.c,v 1.34 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $	*/
 
 /*
@@ -66,10 +66,6 @@ extern	const struct vfsops msdosfs_vfsops;
 extern	const struct vfsops nfs_vfsops;
 #endif
 
-#ifdef PROCFS
-extern	const struct vfsops procfs_vfsops;
-#endif
-
 #ifdef CD9660
 extern	const struct vfsops cd9660_vfsops;
 #endif
@@ -120,10 +116,6 @@ static struct vfsconf vfsconflist[] = {
         { &nfs_vfsops, MOUNT_NFS, 2, 0, 0, NULL },
 #endif
 
-#ifdef PROCFS
-        { &procfs_vfsops, MOUNT_PROCFS, 12, 0, 0, NULL },
-#endif
-
 #ifdef NTFS
 	{ &ntfs_vfsops, MOUNT_NTFS, 6, 0, MNT_LOCAL, NULL },
 #endif
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 2917c003447..25526ada9bd 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.h,v 1.120 2014/06/04 07:58:14 claudio Exp $	*/
+/*	$OpenBSD: mount.h,v 1.121 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $	*/
 
 /*
@@ -262,20 +262,6 @@ struct tmpfs_args {
 };
 
 /*
- * Arguments to mount procfs filesystems
- */
-struct procfs_args {
-	int version;
-	int flags;
-};
-
-/*
- * procfs mount options:
- */
-#define PROCFS_ARGSVERSION      1
-#define PROCFSMNT_LINUXCOMPAT   0x01
-
-/*
  * Arguments to mount fusefs filesystems
  */
 struct fusefs_args {
@@ -297,7 +283,6 @@ union mount_info {
 	struct mfs_args mfs_args;
 	struct nfs_args nfs_args;
 	struct iso_args iso_args;
-	struct procfs_args procfs_args;
 	struct msdosfs_args msdosfs_args;
 	struct ntfs_args ntfs_args;
 	struct tmpfs_args tmpfs_args;
@@ -345,7 +330,6 @@ struct statfs {
 #define	MOUNT_NFS	"nfs"		/* Network Filesystem */
 #define	MOUNT_MFS	"mfs"		/* Memory Filesystem */
 #define	MOUNT_MSDOS	"msdos"		/* MSDOS Filesystem */
-#define	MOUNT_PROCFS	"procfs"	/* /proc Filesystem */
 #define	MOUNT_AFS	"afs"		/* Andrew Filesystem */
 #define	MOUNT_CD9660	"cd9660"	/* ISO9660 (aka CDROM) Filesystem */
 #define	MOUNT_EXT2FS	"ext2fs"	/* Second Extended Filesystem */
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b278162910a..25a7fcdcfe5 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.124 2014/04/08 18:48:41 beck Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.125 2014/09/08 01:47:06 guenther Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -74,7 +74,7 @@ enum vtagtype	{
 
 #define	VTAG_NAMES \
     "NON", "UFS", "NFS", "MFS", "MSDOSFS",			\
-    "PORTAL", "PROCFS", "AFS", "ISOFS", "ADOSFS",		\
+    "unused", "unused", "unused", "ISOFS", "unused",		\
     "EXT2FS", "VFS", "NTFS", "UDF", "FUSEFS", "TMPFS"
 
 /*