More loadable VFS changes:

- Make a number of filesystems work again when they are statically compiled
  (blush)

- FIFOs are no longer optional; ``options FIFO'' removed from distributed
  config files.

6 files changed, 6 insertions, 32 deletions

diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index ee2a3c1..b4986ab 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id: ffs_extern.h,v 1.3 1994/08/02 07:54:19 davidg Exp $
+ * $Id: ffs_extern.h,v 1.4 1994/08/18 22:35:53 wollman Exp $
  */
 
 struct buf;
@@ -92,9 +92,5 @@ __END_DECLS
 
 extern int (**ffs_vnodeop_p)();
 extern int (**ffs_specop_p)();
-#ifdef FIFO
 extern int (**ffs_fifoop_p)();
 #define FFS_FIFOOPS ffs_fifoop_p
-#else
-#define FFS_FIFOOPS NULL
-#endif
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 38ece41..e6414fb 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.7 (Berkeley) 2/3/94
- * $Id: ffs_vnops.c,v 1.3 1994/08/08 17:30:59 davidg Exp $
+ * $Id: ffs_vnops.c,v 1.4 1994/09/21 03:47:38 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -160,7 +160,6 @@ struct vnodeopv_entry_desc ffs_specop_entries[] = {
 struct vnodeopv_desc ffs_specop_opv_desc =
 	{ &ffs_specop_p, ffs_specop_entries };
 
-#ifdef FIFO
 int (**ffs_fifoop_p)();
 struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -209,13 +208,10 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 };
 struct vnodeopv_desc ffs_fifoop_opv_desc =
 	{ &ffs_fifoop_p, ffs_fifoop_entries };
-#endif /* FIFO */
 
 VNODEOP_SET(ffs_vnodeop_opv_desc);
 VNODEOP_SET(ffs_specop_opv_desc);
-#ifdef FIFO
 VNODEOP_SET(ffs_fifoop_opv_desc);
-#endif
 
 #ifdef DEBUG
 /*
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index 5b6db4f..59f19a6 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id: lfs_extern.h,v 1.2 1994/08/02 07:54:34 davidg Exp $
+ * $Id: lfs_extern.h,v 1.3 1994/08/21 07:16:09 paul Exp $
  */
 
 #ifndef _UFS_LFS_LFS_EXTERN_H_
@@ -102,11 +102,7 @@ void	lfs_dump_super __P((struct lfs *));
 __END_DECLS
 extern int (**lfs_vnodeop_p)();
 extern int (**lfs_specop_p)();
-#ifdef FIFO
 extern int (**lfs_fifoop_p)();
 #define LFS_FIFOOPS lfs_fifoop_p
-#else
-#define LFS_FIFOOPS NULL
-#endif
 
 #endif
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 44902de..fccabaa 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.3 1994/08/02 07:54:40 davidg Exp $
+ * $Id: lfs_vnops.c,v 1.4 1994/09/21 03:47:40 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -159,7 +159,6 @@ struct vnodeopv_entry_desc lfs_specop_entries[] = {
 struct vnodeopv_desc lfs_specop_opv_desc =
 	{ &lfs_specop_p, lfs_specop_entries };
 
-#ifdef FIFO
 int (**lfs_fifoop_p)();
 struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -207,13 +206,10 @@ struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 };
 struct vnodeopv_desc lfs_fifoop_opv_desc =
 	{ &lfs_fifoop_p, lfs_fifoop_entries };
-#endif /* FIFO */
 
 VNODEOP_SET(lfs_vnodeop_opv_desc);
 VNODEOP_SET(lfs_specop_opv_desc);
-#ifdef FIFO
 VNODEOP_SET(lfs_fifoop_opv_desc);
-#endif
 
 #define	LFS_READWRITE
 #include <ufs/ufs/ufs_readwrite.c>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 6ae7d18..8370ecf 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id: ufs_extern.h,v 1.2 1994/08/02 07:54:54 davidg Exp $
+ * $Id: ufs_extern.h,v 1.3 1994/08/21 07:16:17 paul Exp $
  */
 
 #ifndef _UFS_UFS_UFS_EXTERN_H_
@@ -121,11 +121,9 @@ int	 ufsspec_close __P((struct vop_close_args *));
 int	 ufsspec_read __P((struct vop_read_args *));
 int	 ufsspec_write __P((struct vop_write_args *));
 
-#ifdef FIFO
 int	ufsfifo_read __P((struct vop_read_args *));
 int	ufsfifo_write __P((struct vop_write_args *));
 int	ufsfifo_close __P((struct vop_close_args *));
-#endif
 __END_DECLS
 
 #endif
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index ff1c2cb..41e1bba 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.10 (Berkeley) 4/1/94
- * $Id: ufs_vnops.c,v 1.3 1994/08/02 07:55:03 davidg Exp $
+ * $Id: ufs_vnops.c,v 1.4 1994/08/08 17:31:01 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -1755,10 +1755,8 @@ ufs_print(ap)
 
 	printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
 		major(ip->i_dev), minor(ip->i_dev));
-#ifdef FIFO
 	if (vp->v_type == VFIFO)
 		fifo_printinfo(vp);
-#endif /* FIFO */
 	printf("%s\n", (ip->i_flag & IN_LOCKED) ? " (LOCKED)" : "");
 	if (ip->i_lockholder == 0)
 		return (0);
@@ -1830,7 +1828,6 @@ ufsspec_close(ap)
 	return (VOCALL (spec_vnodeop_p, VOFFSET(vop_close), ap));
 }
 
-#ifdef FIFO
 /*
  * Read wrapper for fifo's
  */
@@ -1894,7 +1891,6 @@ ufsfifo_close(ap)
 		ITIMES(ip, &time, &time);
 	return (VOCALL (fifo_vnodeop_p, VOFFSET(vop_close), ap));
 }
-#endif /* FIFO */
 
 /*
  * Return POSIX pathconf information applicable to ufs filesystems.
@@ -1991,12 +1987,8 @@ ufs_vinit(mntp, specops, fifoops, vpp)
 		}
 		break;
 	case VFIFO:
-#ifdef FIFO
 		vp->v_op = fifoops;
 		break;
-#else
-		return (EOPNOTSUPP);
-#endif
 	}
 	if (ip->i_number == ROOTINO)
                 vp->v_flag |= VROOT;