put FFS stuff on a #define

SCCS-vsn: sys/kern/vfs_conf.c 7.5

diff --git a/usr/src/sys/kern/vfs_conf.c b/usr/src/sys/kern/vfs_conf.c
index 6f84fa0..0b9756c 100644 (file)
--- a/usr/src/sys/kern/vfs_conf.c
+++ b/usr/src/sys/kern/vfs_conf.c
@@ -4,11 +4,13 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_conf.c  7.4 (Berkeley) %G%
+ *     @(#)vfs_conf.c  7.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
 #include <sys/mount.h>
  */
 
 #include <sys/param.h>
 #include <sys/mount.h>

+
+#ifdef FFS

 #include <ufs/ffs/ffs_extern.h>
 
 /*
 #include <ufs/ffs/ffs_extern.h>
 
 /*


@@ -16,6 +18,7 @@
  * This specification should be done by /etc/config.
  */
 int (*mountroot)() = ffs_mountroot;
  * This specification should be done by /etc/config.
  */
 int (*mountroot)() = ffs_mountroot;

+#endif

 
 /*
  * These define the root filesystem and device.
 
 /*
  * These define the root filesystem and device.


@@ -27,7 +30,9 @@ struct vnode *rootdir;
  * Set up the filesystem operations for vnodes.
  * The types are defined in mount.h.
  */
  * Set up the filesystem operations for vnodes.
  * The types are defined in mount.h.
  */

+#ifdef FFS

 extern struct vfsops ufs_vfsops;
 extern struct vfsops ufs_vfsops;

+#endif

 
 #ifdef LFS
 extern struct vfsops lfs_vfsops;
 
 #ifdef LFS
 extern struct vfsops lfs_vfsops;


@@ -43,7 +48,11 @@ extern       struct vfsops nfs_vfsops;
 
 struct vfsops *vfssw[] = {
        NULL,                   /* 0 = MOUNT_NONE */
 
 struct vfsops *vfssw[] = {
        NULL,                   /* 0 = MOUNT_NONE */

+#ifdef FFS

        &ufs_vfsops,            /* 1 = MOUNT_UFS */
        &ufs_vfsops,            /* 1 = MOUNT_UFS */

+#else
+       NULL,
+#endif

 #ifdef NFS
        &nfs_vfsops,            /* 2 = MOUNT_NFS */
 #else
 #ifdef NFS
        &nfs_vfsops,            /* 2 = MOUNT_NFS */
 #else