Decommision miscfs/specfs/specdev.h. Most of it goes into <sys/conf.h>,

a few lines into <sys/vnode.h>.

Add a few fields to struct specinfo, paving the way for the fun part.

58 files changed, 206 insertions, 238 deletions

diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 07a36aa..fda8393 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.15 1999/07/20 07:18:17 phk Exp $
+ *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
  * 
  */
 
@@ -63,8 +63,6 @@
 #include <coda/coda_subr.h>
 #include <coda/coda_opstats.h>
 
-#include <miscfs/specfs/specdev.h>
-
 MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures");
 
 int codadebug = 0;
diff --git a/sys/contrib/softupdates/ffs_softdep.c b/sys/contrib/softupdates/ffs_softdep.c
index 2cd212f..3c9e752 100644
--- a/sys/contrib/softupdates/ffs_softdep.c
+++ b/sys/contrib/softupdates/ffs_softdep.c
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep.c	9.40 (McKusick) 6/15/99
- *	$Id: ffs_softdep.c,v 1.33 1999/06/27 13:26:23 peter Exp $
+ *	$Id: ffs_softdep.c,v 1.34 1999/06/29 15:57:40 mckusick Exp $
  */
 
 /*
@@ -75,7 +75,7 @@
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
+#include <sys/conf.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index 60ee284..4d67a35 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -114,7 +114,6 @@
 
 #include <sys/param.h>
 #include <sys/cdefs.h>
-#include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -124,6 +123,7 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/conf.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 963a11e..c55757e 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,12 +39,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinuminterrupt.c,v 1.6 1999/06/18 00:50:53 grog Exp grog $
+ * $Id: vinuminterrupt.c,v 1.12 1999/08/07 08:06:30 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 void complete_raid5_write(struct rqelement *);
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 8fa4f3e..43eefe9 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,12 +33,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.33 1999/08/07 08:07:05 grog Exp $
+ * $Id: vinumio.c,v 1.34 1999/08/08 14:11:03 bde Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 
 static char *sappend(char *txt, char *s);
 static int drivecmp(const void *va, const void *vb);
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 0d3af63..8e68a72 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: raid5.c,v 1.15 1999/07/07 03:46:01 grog Exp grog $
+ * $Id: vinumraid5.c,v 1.1 1999/08/07 08:22:49 grog Exp $
  */
 /*
  * XXX To do:
@@ -48,7 +48,6 @@
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 /*
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 646fd1d..cab4aa5 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,12 +37,11 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrequest.c,v 1.24 1999/07/05 01:53:14 grog Exp grog $
+ * $Id: vinumrequest.c,v 1.29 1999/08/07 08:13:23 grog Exp $
  */
 
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/resourcevar.h>
 
 enum requeststatus bre(struct request *rq,
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 06bf27f..9087d25 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.80 1999/05/30 16:51:55 phk Exp $
+ *	$Id: vn.c,v 1.81 1999/07/20 09:47:33 phk Exp $
  */
 
 /*
@@ -89,7 +89,6 @@
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
-#include <miscfs/specfs/specdev.h>
 #include <sys/vnioctl.h>
 
 #include <vm/vm.h>
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 60ee284..4d67a35 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -114,7 +114,6 @@
 
 #include <sys/param.h>
 #include <sys/cdefs.h>
-#include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -124,6 +123,7 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
+#include <sys/conf.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 907c138..d202bc5 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.55 1999/05/08 06:39:32 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.56 1999/05/31 11:27:21 phk Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/cdio.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 0b07d14..86cd115 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.55 1999/04/18 10:58:02 dcs Exp $
+ * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -47,11 +47,11 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
 #include <miscfs/fifofs/fifo.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/unistd.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_zone.h>
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index 07a36aa..fda8393 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.15 1999/07/20 07:18:17 phk Exp $
+ *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
  * 
  */
 
@@ -63,8 +63,6 @@
 #include <coda/coda_subr.h>
 #include <coda/coda_opstats.h>
 
-#include <miscfs/specfs/specdev.h>
-
 MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures");
 
 int codadebug = 0;
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 9312e30..da1b507 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.44 1999/05/08 06:40:00 phk Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.45 1999/05/31 11:28:02 phk Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/fcntl.h>
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 2034f53..3c0a033 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.86 1999/06/26 02:46:26 mckusick Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -59,7 +59,6 @@
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/signalvar.h>
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index ba65c07..953b416 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
  */
 
 #include <sys/param.h>
@@ -42,8 +42,6 @@
 #include <machine/clock.h>
 #endif
 
-#include <miscfs/specfs/specdev.h>
-
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_compr.h>
 
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index c5edd73..46b45de 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
  */
 
 #include <sys/param.h>
@@ -43,8 +43,6 @@
 #include <machine/clock.h>
 #endif
 
-#include <miscfs/specfs/specdev.h>
-
 /* #define NTFS_DEBUG 1 */
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfsmount.h>
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index b224001..d8ed12b 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.6 1999/05/12 09:43:04 semenu Exp $
+ *	$Id: ntfs_vfsops.c,v 1.7 1999/05/31 11:28:30 phk Exp $
  */
 
 
@@ -48,8 +48,6 @@
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 
-#include <miscfs/specfs/specdev.h>
-
 /*#define NTFS_DEBUG 1*/
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 813ac18..fff9add 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.4 1999/05/11 19:54:52 phk Exp $
+ *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
  *
  */
 
@@ -72,7 +72,6 @@
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_subr.h>
 #include <ntfs/ntfs_extern.h>
-#include <miscfs/specfs/specdev.h>
 
 static int	ntfs_bypass __P((struct vop_generic_args *ap));
 static int	ntfs_read __P((struct vop_read_args *));
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 9dff63d..29d0d7b 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.89 1999/06/26 02:46:21 mckusick Exp $
+ * $Id: spec_vnops.c,v 1.90 1999/07/20 09:47:45 phk Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +55,6 @@
 #include <vm/vnode_pager.h>
 #include <vm/vm_extern.h>
 
-#include <miscfs/specfs/specdev.h>
-
 static int	spec_advlock __P((struct vop_advlock_args *));  
 static int	spec_badop __P((void));
 static int	spec_bmap __P((struct vop_bmap_args *));
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 8532628..7f1e5a3 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.27 1999/05/07 10:11:36 phk Exp $
+ * $Id: ufs_bmap.c,v 1.28 1999/05/08 06:40:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
-#include <miscfs/specfs/specdev.h>
 
 /*
  * Bmap converts a the logical block number of a file to its physical block
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index db93539..32df655 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -55,8 +55,6 @@
 #include <sys/malloc.h>
 #include <sys/stat.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 8532628..7f1e5a3 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.27 1999/05/07 10:11:36 phk Exp $
+ * $Id: ufs_bmap.c,v 1.28 1999/05/08 06:40:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
-#include <miscfs/specfs/specdev.h>
 
 /*
  * Bmap converts a the logical block number of a file to its physical block
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index db93539..32df655 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -55,8 +55,6 @@
 #include <sys/malloc.h>
 #include <sys/stat.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 907c138..d202bc5 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.55 1999/05/08 06:39:32 phk Exp $
+ * $Id: cd9660_vfsops.c,v 1.56 1999/05/31 11:27:21 phk Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/cdio.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 0b07d14..86cd115 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.55 1999/04/18 10:58:02 dcs Exp $
+ * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -47,11 +47,11 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
 #include <miscfs/fifofs/fifo.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/unistd.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_zone.h>
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index b944149..0a20262 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.53 1999/07/20 21:51:12 green Exp $
+ * $Id: kern_conf.c,v 1.54 1999/08/08 00:34:00 grog Exp $
  */
 
 #include <sys/param.h>
@@ -41,8 +41,7 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 #include <sys/queue.h>
-
-#include <miscfs/specfs/specdev.h>
+#include <machine/stdarg.h>
 
 #define cdevsw_ALLOCSTART	(NUMCDEVSW/2)
 
@@ -230,6 +229,10 @@ makedev(int x, int y)
 	si->si_bsize_phys = DEV_BSIZE;
 	si->si_bsize_best = BLKDEV_IOSIZE;
 	si->si_bsize_max = MAXBSIZE;
+	if (y > 256)
+		sprintf(si->si_name, "#%d/0x%x", x, y);
+	else
+		sprintf(si->si_name, "#%d/%d", x, y);
 	SLIST_INSERT_HEAD(&dev_hash[hash], si, si_hash);
         return (si);
 }
@@ -283,3 +286,19 @@ makeudev(int x, int y)
         return ((x << 8) | y);
 }
 
+dev_t
+make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char *fmt, ...)
+{
+	dev_t	dev;
+	va_list ap;
+	int i;
+
+	dev = makedev(devsw->d_maj, minor);
+	va_start(ap, fmt);
+	i = kvprintf(fmt, NULL, dev->si_name, 32, ap);
+	dev->si_name[i] = '\0';
+	va_end(ap);
+	dev->si_devsw = devsw;
+	return (dev);
+}
+
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index f6ada02..d9e9250 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_mib.c,v 1.21 1999/07/19 09:13:12 phk Exp $
+ * $Id: kern_mib.c,v 1.22 1999/07/20 07:19:32 phk Exp $
  */
 
 #include <sys/param.h>
@@ -246,6 +246,6 @@ SYSCTL_INT(_debug_sizeof, OID_AUTO, vnode, CTLFLAG_RD,
 SYSCTL_INT(_debug_sizeof, OID_AUTO, proc, CTLFLAG_RD, 
     0, sizeof(struct proc), "sizeof(struct proc)");
 
-#include <miscfs/specfs/specdev.h>
+#include <sys/conf.h>
 SYSCTL_INT(_debug_sizeof, OID_AUTO, specinfo, CTLFLAG_RD,
     0, sizeof(struct specinfo), "sizeof(struct specinfo)");
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 4c2132d..266f97f 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.53 1999/06/30 15:33:36 peter Exp $
+ * $Id: vfs_aio.c,v 1.54 1999/07/01 13:21:40 peter Exp $
  */
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>
-#include <miscfs/specfs/specdev.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index d3a668e..83a55b9 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.223 1999/07/09 16:41:19 peter Exp $
+ * $Id: vfs_bio.c,v 1.224 1999/07/26 06:25:16 alc Exp $
  */
 
 /*
@@ -38,7 +38,6 @@
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
 #include <sys/lock.h>
-#include <miscfs/specfs/specdev.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_prot.h>
@@ -52,6 +51,7 @@
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
+#include <sys/conf.h>
 
 static MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer");
 
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 53069af..0a711d0 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.213 1999/07/20 09:47:44 phk Exp $
+ * $Id: vfs_subr.c,v 1.214 1999/07/26 06:25:17 alc Exp $
  */
 
 /*
@@ -46,7 +46,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
@@ -60,6 +59,7 @@
 #include <sys/domain.h>
 #include <sys/dirent.h>
 #include <sys/vmmeter.h>
+#include <sys/conf.h>
 
 #include <machine/limits.h>
 
@@ -76,8 +76,6 @@
 #include <vm/vm_zone.h>
 #include <sys/sysctl.h>
 
-#include <miscfs/specfs/specdev.h>
-
 static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
 
 static struct vnode *checkalias2 __P((struct vnode *nvp, dev_t dev, struct mount *mp));
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 53069af..0a711d0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.213 1999/07/20 09:47:44 phk Exp $
+ * $Id: vfs_subr.c,v 1.214 1999/07/26 06:25:17 alc Exp $
  */
 
 /*
@@ -46,7 +46,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
@@ -60,6 +59,7 @@
 #include <sys/domain.h>
 #include <sys/dirent.h>
 #include <sys/vmmeter.h>
+#include <sys/conf.h>
 
 #include <machine/limits.h>
 
@@ -76,8 +76,6 @@
 #include <vm/vm_zone.h>
 #include <sys/sysctl.h>
 
-#include <miscfs/specfs/specdev.h>
-
 static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure");
 
 static struct vnode *checkalias2 __P((struct vnode *nvp, dev_t dev, struct mount *mp));
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 683d2c7..0a09c66 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.74 1999/05/11 19:54:35 phk Exp $
+ *	$Id: devfs_vnops.c,v 1.75 1999/06/26 02:46:17 mckusick Exp $
  */
 
 
@@ -41,7 +41,6 @@
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>/* definitions of spec functions we use */
 #include <sys/dirent.h>
 #include <miscfs/devfs/devfsdefs.h>
 #include <sys/vmmeter.h>                                                        
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 9dff63d..29d0d7b 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.89 1999/06/26 02:46:21 mckusick Exp $
+ * $Id: spec_vnops.c,v 1.90 1999/07/20 09:47:45 phk Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +55,6 @@
 #include <vm/vnode_pager.h>
 #include <vm/vm_extern.h>
 
-#include <miscfs/specfs/specdev.h>
-
 static int	spec_advlock __P((struct vop_advlock_args *));  
 static int	spec_badop __P((void));
 static int	spec_bmap __P((struct vop_bmap_args *));
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
deleted file mode 100644
index 3150b49..0000000
--- a/sys/miscfs/specfs/specdev.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  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 the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- *	@(#)specdev.h	8.6 (Berkeley) 5/21/95
- * $Id: specdev.h,v 1.17 1999/05/11 19:54:39 phk Exp $
- */
-
-/*
- * This structure defines the information maintained about
- * special devices. It is allocated in checkalias and freed
- * in vgone.
- */
-struct specinfo {
-	struct	mount *si_mountpoint;
-	int		si_bsize_phys;	/* minimum physical block size */
-	int		si_bsize_best;	/* optimal block size / VBLK */
-	int		si_bsize_max;	/* maximum block size */
-
-	udev_t		si_udev;
-	SLIST_ENTRY(specinfo)	si_hash;
-	struct vnode *si_hlist;
-};
-/*
- * Exported shorthand
- */
-#define v_hashchain v_specinfo->si_hlist
-#define v_specmountpoint v_specinfo->si_mountpoint
-
-/*
- * Special device management
- */
-#define	SPECHSZ	64
-#define	SPECHASH(rdev)	(((unsigned)(minor(rdev)))%SPECHSZ)
-
-
-/*
- * Prototypes for special file operations on vnodes.
- */
-extern	vop_t **spec_vnodeop_p;
-struct	nameidata;
-struct	componentname;
-struct	ucred;
-struct	flock;
-struct	buf;
-struct	uio;
-
-int	spec_vnoperate __P((struct vop_generic_args *));
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 9312e30..da1b507 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.44 1999/05/08 06:40:00 phk Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.45 1999/05/31 11:28:02 phk Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/fcntl.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 2034f53..3c0a033 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.86 1999/06/26 02:46:26 mckusick Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
@@ -59,7 +59,6 @@
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/signalvar.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 68a936a..08108a6 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $
+ * $Id: nfs_subs.c,v 1.79 1999/07/17 18:43:47 phk Exp $
  */
 
 /*
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
@@ -72,8 +73,6 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 68a936a..08108a6 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $
+ * $Id: nfs_subs.c,v 1.79 1999/07/17 18:43:47 phk Exp $
  */
 
 /*
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
@@ -72,8 +73,6 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 4481ee7..0600c26 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.137 1999/07/30 04:51:35 wpaul Exp $
+ * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
  */
 
 
@@ -61,13 +61,13 @@
 #include <sys/lockf.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 
 #include <miscfs/fifofs/fifo.h>
-#include <miscfs/specfs/specdev.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 68a936a..08108a6 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $
+ * $Id: nfs_subs.c,v 1.79 1999/07/17 18:43:47 phk Exp $
  */
 
 /*
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
@@ -72,8 +73,6 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 4481ee7..0600c26 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.137 1999/07/30 04:51:35 wpaul Exp $
+ * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
  */
 
 
@@ -61,13 +61,13 @@
 #include <sys/lockf.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 
 #include <miscfs/fifofs/fifo.h>
-#include <miscfs/specfs/specdev.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 68a936a..08108a6 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.78 1999/06/27 11:44:19 peter Exp $
+ * $Id: nfs_subs.c,v 1.79 1999/07/17 18:43:47 phk Exp $
  */
 
 /*
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 #include <sys/sysent.h>
 #include <sys/syscall.h>
+#include <sys/conf.h>
 
 #include <vm/vm.h>
 #include <vm/vm_object.h>
@@ -72,8 +73,6 @@
 #include <nfs/nqnfs.h>
 #include <nfs/nfsrtt.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <netinet/in.h>
 #ifdef ISO
 #include <netiso/iso.h>
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index ba65c07..953b416 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
  */
 
 #include <sys/param.h>
@@ -42,8 +42,6 @@
 #include <machine/clock.h>
 #endif
 
-#include <miscfs/specfs/specdev.h>
-
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_compr.h>
 
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index c5edd73..46b45de 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
  */
 
 #include <sys/param.h>
@@ -43,8 +43,6 @@
 #include <machine/clock.h>
 #endif
 
-#include <miscfs/specfs/specdev.h>
-
 /* #define NTFS_DEBUG 1 */
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfsmount.h>
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index b224001..d8ed12b 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.6 1999/05/12 09:43:04 semenu Exp $
+ *	$Id: ntfs_vfsops.c,v 1.7 1999/05/31 11:28:30 phk Exp $
  */
 
 
@@ -48,8 +48,6 @@
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 
-#include <miscfs/specfs/specdev.h>
-
 /*#define NTFS_DEBUG 1*/
 #include <ntfs/ntfs.h>
 #include <ntfs/ntfs_inode.h>
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index 813ac18..fff9add 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.4 1999/05/11 19:54:52 phk Exp $
+ *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
  *
  */
 
@@ -72,7 +72,6 @@
 #include <ntfs/ntfs_inode.h>
 #include <ntfs/ntfs_subr.h>
 #include <ntfs/ntfs_extern.h>
-#include <miscfs/specfs/specdev.h>
 
 static int	ntfs_bypass __P((struct vop_generic_args *ap));
 static int	ntfs_read __P((struct vop_read_args *));
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 885350ea8..0f76bca 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,22 +36,57 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.66 1999/07/17 19:58:51 phk Exp $
+ * $Id: conf.h,v 1.67 1999/07/20 09:47:50 phk Exp $
  */
 
 #ifndef _SYS_CONF_H_
 #define	_SYS_CONF_H_
 
+#define SPECNAMELEN	15
+
+struct tty;
+struct vnode;
+
+struct specinfo {
+	struct	mount *si_mountpoint;
+	int		si_bsize_phys;	/* minimum physical block size */
+	int		si_bsize_best;	/* optimal block size / VBLK */
+	int		si_bsize_max;	/* maximum block size */
+
+	udev_t		si_udev;
+	SLIST_ENTRY(specinfo)	si_hash;
+	struct vnode	*si_hlist;
+	char		si_name[SPECNAMELEN + 1];
+	void		*si_drv1, *si_drv2;
+	struct cdevsw	*si_devsw;
+	union {
+		struct {
+			struct tty *__sit_tty;
+		} __si_tty;
+	} __si_u;
+};
+
+#define si_tty_tty	__si_u.__si_tty.__sit_tty
+
+/*
+ * Exported shorthand
+ */
+#define v_hashchain v_specinfo->si_hlist
+#define v_specmountpoint v_specinfo->si_mountpoint
+
+/*
+ * Special device management
+ */
+#define	SPECHSZ	64
+#define	SPECHASH(rdev)	(((unsigned)(minor(rdev)))%SPECHSZ)
+
 /*
  * Definitions of device driver entry switches
  */
 
 struct buf;
 struct proc;
-struct specinfo;
-struct tty;
 struct uio;
-struct vnode;
 
 typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct proc *p));
 typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct proc *p));
@@ -98,11 +133,6 @@ typedef int l_modem_t __P((struct tty *tp, int flag));
 #define	D_CANFREE	0x40000		/* can free blocks */
 
 /*
- * Control type for d_parms() call.
- */
-#define DPARM_GET	0		/* ask device to load parms in  */
-
-/*
  * Character device switch table
  */
 struct cdevsw {
@@ -225,7 +255,24 @@ int	devsw_module_handler __P((struct module *mod, int what, void *arg));
 int	iskmemdev __P((dev_t dev));
 int	iszerodev __P((dev_t dev));
 dev_t	makebdev __P((int maj, int min));
+dev_t	make_dev __P((struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char *fmt, ...)) __printflike(6, 7);
 void	setconf __P((void));
+
+/*
+ * XXX: This gunk included in case DEVFS resurfaces 
+ */
+
+#define		UID_ROOT	0
+#define		UID_BIN		3
+#define		UID_UUCP	66
+
+#define		GID_WHEEL	0
+#define		GID_KMEM	2
+#define		GID_OPERATOR	5
+#define		GID_BIN		7
+#define		GID_GAMES	13
+#define		GID_DIALER	68
+
 #endif /* KERNEL */
 
 #endif /* !_SYS_CONF_H_ */
diff --git a/sys/sys/devfsext.h b/sys/sys/devfsext.h
index 425cbff..0e3e576 100644
--- a/sys/sys/devfsext.h
+++ b/sys/sys/devfsext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsext.h,v 1.21 1998/07/13 06:45:16 bde Exp $
+ * $Id: devfsext.h,v 1.22 1998/12/10 19:57:01 eivind Exp $
  */
 
 #ifndef _SYS_DEVFSEXT_H_
@@ -69,17 +69,4 @@ dev_t devfs_vntodev __P((struct vnode *vn)); /* extract dev_t from devfs vn */
 #define DV_BLK 1
 #define DV_DEV 2
 
-/* XXX */
-#define	UID_ROOT	0
-#define	UID_BIN		3
-#define	UID_UUCP	66
-
-/* XXX */
-#define	GID_WHEEL	0
-#define	GID_KMEM	2
-#define	GID_OPERATOR	5
-#define	GID_BIN		7
-#define	GID_GAMES	13
-#define	GID_DIALER	68
-
 #endif /* !_SYS_DEVFSEXT_H_ */
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 885350ea8..0f76bca 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,22 +36,57 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.66 1999/07/17 19:58:51 phk Exp $
+ * $Id: conf.h,v 1.67 1999/07/20 09:47:50 phk Exp $
  */
 
 #ifndef _SYS_CONF_H_
 #define	_SYS_CONF_H_
 
+#define SPECNAMELEN	15
+
+struct tty;
+struct vnode;
+
+struct specinfo {
+	struct	mount *si_mountpoint;
+	int		si_bsize_phys;	/* minimum physical block size */
+	int		si_bsize_best;	/* optimal block size / VBLK */
+	int		si_bsize_max;	/* maximum block size */
+
+	udev_t		si_udev;
+	SLIST_ENTRY(specinfo)	si_hash;
+	struct vnode	*si_hlist;
+	char		si_name[SPECNAMELEN + 1];
+	void		*si_drv1, *si_drv2;
+	struct cdevsw	*si_devsw;
+	union {
+		struct {
+			struct tty *__sit_tty;
+		} __si_tty;
+	} __si_u;
+};
+
+#define si_tty_tty	__si_u.__si_tty.__sit_tty
+
+/*
+ * Exported shorthand
+ */
+#define v_hashchain v_specinfo->si_hlist
+#define v_specmountpoint v_specinfo->si_mountpoint
+
+/*
+ * Special device management
+ */
+#define	SPECHSZ	64
+#define	SPECHASH(rdev)	(((unsigned)(minor(rdev)))%SPECHSZ)
+
 /*
  * Definitions of device driver entry switches
  */
 
 struct buf;
 struct proc;
-struct specinfo;
-struct tty;
 struct uio;
-struct vnode;
 
 typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct proc *p));
 typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct proc *p));
@@ -98,11 +133,6 @@ typedef int l_modem_t __P((struct tty *tp, int flag));
 #define	D_CANFREE	0x40000		/* can free blocks */
 
 /*
- * Control type for d_parms() call.
- */
-#define DPARM_GET	0		/* ask device to load parms in  */
-
-/*
  * Character device switch table
  */
 struct cdevsw {
@@ -225,7 +255,24 @@ int	devsw_module_handler __P((struct module *mod, int what, void *arg));
 int	iskmemdev __P((dev_t dev));
 int	iszerodev __P((dev_t dev));
 dev_t	makebdev __P((int maj, int min));
+dev_t	make_dev __P((struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, char *fmt, ...)) __printflike(6, 7);
 void	setconf __P((void));
+
+/*
+ * XXX: This gunk included in case DEVFS resurfaces 
+ */
+
+#define		UID_ROOT	0
+#define		UID_BIN		3
+#define		UID_UUCP	66
+
+#define		GID_WHEEL	0
+#define		GID_KMEM	2
+#define		GID_OPERATOR	5
+#define		GID_BIN		7
+#define		GID_GAMES	13
+#define		GID_DIALER	68
+
 #endif /* KERNEL */
 
 #endif /* !_SYS_CONF_H_ */
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index e07db5e..1e5a0af 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.91 1999/07/20 09:47:54 phk Exp $
+ * $Id: vnode.h,v 1.92 1999/07/26 06:25:53 alc Exp $
  */
 
 #ifndef _SYS_VNODE_H_
@@ -505,6 +505,7 @@ void	cvtnstat __P((struct stat *sb, struct nstat *nsb));
 int 	getnewvnode __P((enum vtagtype tag,
 	    struct mount *mp, vop_t **vops, struct vnode **vpp));
 int	lease_check __P((struct vop_lease_args *ap));
+int	spec_vnoperate __P((struct vop_generic_args *));
 int	speedup_syncer __P((void));
 void 	vattr_null __P((struct vattr *vap));
 int 	vcount __P((struct vnode *vp));
@@ -573,6 +574,7 @@ void	vref __P((struct vnode *vp));
 void	vbusy __P((struct vnode *vp));
 
 extern	vop_t	**default_vnodeop_p;
+extern	vop_t **spec_vnodeop_p;
 
 extern TAILQ_HEAD(tobefreelist, vnode)
 	vnode_tobefree_list;	/* vnode free list */
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 2cd212f..3c9e752 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -53,7 +53,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep.c	9.40 (McKusick) 6/15/99
- *	$Id: ffs_softdep.c,v 1.33 1999/06/27 13:26:23 peter Exp $
+ *	$Id: ffs_softdep.c,v 1.34 1999/06/29 15:57:40 mckusick Exp $
  */
 
 /*
@@ -75,7 +75,7 @@
 #include <sys/proc.h>
 #include <sys/syslog.h>
 #include <sys/vnode.h>
-#include <miscfs/specfs/specdev.h>
+#include <sys/conf.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 0e1abab..885d1e9 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.99 1999/05/31 11:29:24 phk Exp $
+ * $Id: ffs_vfsops.c,v 1.100 1999/07/11 19:16:50 phk Exp $
  */
 
 #include "opt_quota.h"
@@ -49,8 +49,6 @@
 #include <sys/disklabel.h>
 #include <sys/malloc.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 29f403a..dbf2a91 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.57 1999/06/18 05:49:46 mckusick Exp $
+ * $Id: ffs_vnops.c,v 1.58 1999/06/26 02:46:39 mckusick Exp $
  */
 
 #include <sys/param.h>
@@ -44,6 +44,7 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
+#include <sys/conf.h>
 
 #include <machine/limits.h>
 
@@ -61,8 +62,6 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
-#include <miscfs/specfs/specdev.h>
-
 static int	ffs_fsync __P((struct vop_fsync_args *));
 static int	ffs_getpages __P((struct vop_getpages_args *));
 static int	ffs_putpages __P((struct vop_putpages_args *));
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 09b65e4..c2a5fbd 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
- * $Id: mfs_vnops.c,v 1.44 1999/05/02 23:56:57 alc Exp $
+ * $Id: mfs_vnops.c,v 1.45 1999/06/26 02:46:41 mckusick Exp $
  */
 
 #include <sys/param.h>
@@ -43,8 +43,7 @@
 #include <sys/malloc.h>
 #include <sys/sysproto.h>
 #include <sys/mman.h>
-
-#include <miscfs/specfs/specdev.h>
+#include <sys/conf.h>
 
 #include <ufs/mfs/mfsnode.h>
 #include <ufs/mfs/mfs_extern.h>
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 8532628..7f1e5a3 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.27 1999/05/07 10:11:36 phk Exp $
+ * $Id: ufs_bmap.c,v 1.28 1999/05/08 06:40:25 phk Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
-#include <miscfs/specfs/specdev.h>
 
 /*
  * Bmap converts a the logical block number of a file to its physical block
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 04006b7..41ab0e4 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.115 1999/06/16 23:27:53 mckusick Exp $
+ * $Id: ufs_vnops.c,v 1.116 1999/07/13 18:20:13 mckusick Exp $
  */
 
 #include "opt_quota.h"
@@ -57,12 +57,12 @@
 #include <sys/dirent.h>
 #include <sys/lockf.h>
 #include <sys/poll.h>
+#include <sys/conf.h>
 
 #include <vm/vm_zone.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
-#include <miscfs/specfs/specdev.h>
 #include <miscfs/fifofs/fifo.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index e077a59..fe9bf90 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.99 1999/05/17 00:53:56 alc Exp $
+ * $Id: vm_mmap.c,v 1.100 1999/06/05 18:21:53 alc Exp $
  */
 
 /*
@@ -61,8 +61,6 @@
 #include <sys/stat.h>
 #include <sys/vmmeter.h>
 
-#include <miscfs/specfs/specdev.h>
-
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_prot.h>
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 9b9f405..39f9cc4 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.78 1999/07/17 19:59:55 phk Exp $
+ * $Id: vm_swap.c,v 1.79 1999/07/20 21:29:11 green Exp $
  */
 
 #include "opt_devfs.h"
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/buf.h>
-#include <sys/conf.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif
@@ -53,12 +52,11 @@
 #include <sys/blist.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/conf.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/swap_pager.h>
 
-#include <miscfs/specfs/specdev.h>
-
 /*
  * "sw" is a fake device implemented
  * in vm_swap.c and used only internally to get to swstrategy.