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.

8 files changed, 20 insertions, 20 deletions

diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index ffa12ea..e98fc95 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vfsops.c,v 1.30 1998/05/06 05:29:32 msmith Exp $
+ *	$Id: devfs_vfsops.c,v 1.31 1998/08/16 01:21:51 bde Exp $
  *
  */
 
@@ -122,9 +122,9 @@ DBPRINT(("mount "));
 	 *  Fill out some fields
 	 */
 	mp->mnt_data = (qaddr_t)devfs_mp_p;
-	mp->mnt_stat.f_type = MOUNT_DEVFS;
+	mp->mnt_stat.f_type = mp->mnt_vfc->vfc_typenum;
 	mp->mnt_stat.f_fsid.val[0] = (intptr_t)(void *)devfs_mp_p;
-	mp->mnt_stat.f_fsid.val[1] = MOUNT_DEVFS;
+	mp->mnt_stat.f_fsid.val[1] = mp->mnt_vfc->vfc_typenum;
 	mp->mnt_flag |= MNT_LOCAL;
 
 	if(error = dev_dup_plane(devfs_mp_p))
@@ -219,7 +219,7 @@ devfs_statfs( struct mount *mp, struct statfs *sbp, struct proc *p)
  *  Fill in the stat block.
  */
 DBPRINT(("statfs "));
-	sbp->f_type   = MOUNT_DEVFS;
+	sbp->f_type   = mp->mnt_stat.f_type;
 	sbp->f_flags  = 0;		/* XXX */
 	sbp->f_bsize  = 128;
 	sbp->f_iosize = 1024;	/* XXX*/
@@ -229,7 +229,7 @@ DBPRINT(("statfs "));
 	sbp->f_files  = 128;
 	sbp->f_ffree  = 0;		/* what to put in here? */
 	sbp->f_fsid.val[0] = (intptr_t)(void *)devfs_mp_p;
-	sbp->f_fsid.val[1] = MOUNT_DEVFS;
+	sbp->f_fsid.val[1] = mp->mnt_stat.f_type;
 
 /*-
  *  Copy the mounted on and mounted from names into
@@ -347,4 +347,4 @@ static struct vfsops devfs_vfsops = {
 	devfs_init
 };
 
-VFS_SET(devfs_vfsops, devfs, MOUNT_DEVFS, 0);
+VFS_SET(devfs_vfsops, devfs, 0);
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index d813a41..de6f03d 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/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/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index c4b9604..c30ed01 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
- * $Id: kernfs_vfsops.c,v 1.21 1998/03/01 22:46:12 msmith Exp $
+ * $Id: kernfs_vfsops.c,v 1.22 1998/05/06 05:29:33 msmith Exp $
  */
 
 /*
@@ -283,4 +283,4 @@ static struct vfsops kernfs_vfsops = {
 	kernfs_init,
 };
 
-VFS_SET(kernfs_vfsops, kernfs, MOUNT_KERNFS, VFCF_SYNTHETIC);
+VFS_SET(kernfs_vfsops, kernfs, VFCF_SYNTHETIC);
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 2730d9f..4ead5bd 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/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/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index eb86ef4..633bf77 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/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/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index ef4c4da..ac1ab53 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/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/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 31d6742..03b4cb4 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/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/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 9f0d8ca..fb700cc 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/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);