Removed statically configured mount type numbers (MOUNT_*) and all

references to them.

The change a couple of days ago to ignore these numbers in statically
configured vfsconf structs was slightly premature because the cd9660,
cfs, devfs, ext2fs, nfs vfs's still used MOUNT_* instead of the number
in their vfsconf struct.

9 files changed, 23 insertions, 20 deletions

diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index cc1672f..293fd96 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.41 1998/07/04 22:30:21 julian Exp $
+ * $Id: cd9660_vfsops.c,v 1.42 1998/09/07 07:20:30 guido Exp $
  */
 
 #include <sys/param.h>
@@ -90,7 +90,7 @@ static struct vfsops cd9660_vfsops = {
 	cd9660_vptofh,
 	cd9660_init
 };
-VFS_SET(cd9660_vfsops, cd9660, MOUNT_CD9660, VFCF_READONLY);
+VFS_SET(cd9660_vfsops, cd9660, VFCF_READONLY);
 
 
 /*
@@ -582,7 +582,6 @@ cd9660_statfs(mp, sbp, p)
 
 	isomp = VFSTOISOFS(mp);
 
-	sbp->f_type = MOUNT_CD9660;
 	sbp->f_bsize = isomp->logical_block_size;
 	sbp->f_iosize = sbp->f_bsize;	/* XXX */
 	sbp->f_blocks = isomp->volume_space_size;
@@ -591,6 +590,7 @@ cd9660_statfs(mp, sbp, p)
 	sbp->f_files =	0; /* total files */
 	sbp->f_ffree = 0; /* free file nodes */
 	if (sbp != &mp->mnt_stat) {
+		sbp->f_type = mp->mnt_vfc->vfc_typenum;
 		bcopy(mp->mnt_stat.f_mntonname, sbp->f_mntonname, MNAMELEN);
 		bcopy(mp->mnt_stat.f_mntfromname, sbp->f_mntfromname, MNAMELEN);
 	}
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index 6486168..0831e17 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/cfs_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: $
+ *  $Id: cfs_vfsops.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
  * 
  */
 
@@ -47,6 +47,9 @@
 /*
  * HISTORY
  * $Log: cfs_vfsops.c,v $
+ * Revision 1.2  1998/09/02 19:09:53  rvb
+ * Pass2 complete
+ *
  * Revision 1.1.1.1  1998/08/29 21:14:52  rvb
  * Very Preliminary Coda
  *
@@ -232,7 +235,7 @@ struct vfsops cfs_vfsops = {
     cfs_init,
 };
 
-VFS_SET(cfs_vfsops, cfs, MOUNT_CFS, VFCF_NETWORK);
+VFS_SET(cfs_vfsops, cfs, VFCF_NETWORK);
 
 int
 cfs_vfsopstats_init(void)
@@ -565,7 +568,7 @@ cfs_nb_statfs(vfsp, sbp, p)
     	#define NB_SFS_SIZ 0x895440
      */
     /* Note: Normal fs's have a bsize of 0x400 == 1024 */
-    sbp->f_type = MOUNT_CFS;
+    sbp->f_type = vfsp->mnt_vfc->vfc_typenum;
     sbp->f_bsize = 8192; /* XXX */
     sbp->f_iosize = 8192; /* XXX */
 #define NB_SFS_SIZ 0x8AB75D
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index d813a41..de6f03d 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.14 1998/03/01 22:46:10 msmith Exp $
+ * $Id: fdesc_vfsops.c,v 1.15 1998/05/06 05:29:33 msmith Exp $
  */
 
 /*
@@ -269,4 +269,4 @@ static struct vfsops fdesc_vfsops = {
 	fdesc_init,
 };
 
-VFS_SET(fdesc_vfsops, fdesc, MOUNT_FDESC, VFCF_SYNTHETIC);
+VFS_SET(fdesc_vfsops, fdesc, VFCF_SYNTHETIC);
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 1a03f62..42798d7 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.34 1998/04/29 12:55:51 dt Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.35 1998/05/06 05:29:38 msmith Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
@@ -1015,4 +1015,4 @@ static struct vfsops msdosfs_vfsops = {
 	msdosfs_init
 };
 
-VFS_SET(msdosfs_vfsops, msdos, MOUNT_MSDOS, 0);
+VFS_SET(msdosfs_vfsops, msdos, 0);
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 2730d9f..4ead5bd 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.26 1998/05/06 05:29:34 msmith Exp $
+ * $Id: null_vfsops.c,v 1.27 1998/07/30 17:40:45 bde Exp $
  */
 
 /*
@@ -422,4 +422,4 @@ static struct vfsops null_vfsops = {
 	nullfs_init,
 };
 
-VFS_SET(null_vfsops, null, MOUNT_NULL, VFCF_LOOPBACK);
+VFS_SET(null_vfsops, null, VFCF_LOOPBACK);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index eb86ef4..633bf77 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $Id: portal_vfsops.c,v 1.20 1998/03/01 22:46:20 msmith Exp $
+ * $Id: portal_vfsops.c,v 1.21 1998/05/06 05:29:35 msmith Exp $
  */
 
 /*
@@ -289,4 +289,4 @@ static struct vfsops portal_vfsops = {
 	portal_init,
 };
 
-VFS_SET(portal_vfsops, portal, MOUNT_PORTAL, VFCF_SYNTHETIC);
+VFS_SET(portal_vfsops, portal, VFCF_SYNTHETIC);
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index ef4c4da..ac1ab53 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- *	$Id: procfs_vfsops.c,v 1.24 1998/07/27 01:07:01 alex Exp $
+ *	$Id: procfs_vfsops.c,v 1.25 1998/07/27 22:47:17 alex Exp $
  */
 
 /*
@@ -212,4 +212,4 @@ static struct vfsops procfs_vfsops = {
 	procfs_init,
 };
 
-VFS_SET(procfs_vfsops, procfs, MOUNT_PROCFS, VFCF_SYNTHETIC);
+VFS_SET(procfs_vfsops, procfs, VFCF_SYNTHETIC);
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 31d6742..03b4cb4 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $Id: umap_vfsops.c,v 1.21 1998/03/01 22:46:24 msmith Exp $
+ * $Id: umap_vfsops.c,v 1.22 1998/05/06 05:29:36 msmith Exp $
  */
 
 /*
@@ -428,4 +428,4 @@ static struct vfsops umap_vfsops = {
 	umapfs_init,
 };
 
-VFS_SET(umap_vfsops, umap, MOUNT_UMAP, VFCF_LOOPBACK);
+VFS_SET(umap_vfsops, umap, VFCF_LOOPBACK);
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 9f0d8ca..fb700cc 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.28 1998/04/17 22:36:56 des Exp $
+ * $Id: union_vfsops.c,v 1.29 1998/05/06 05:29:37 msmith Exp $
  */
 
 /*
@@ -552,4 +552,4 @@ static struct vfsops union_vfsops = {
 	union_init,
 };
 
-VFS_SET(union_vfsops, union, MOUNT_UNION, VFCF_LOOPBACK);
+VFS_SET(union_vfsops, union, VFCF_LOOPBACK);