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.

6 files changed, 10 insertions, 15 deletions

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>