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.

41 files changed, 52 insertions, 152 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d328461..4c0fdec 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.80 1994/09/16 10:23:30 jkh Exp $
+#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
 #
 
 machine		"i386"
@@ -90,7 +90,6 @@ device		ch0
 options		DDB			#Kernel debugger
 options		EON
 pseudo-device	ether
-options		FIFO
 #pseudo-device	imp
 options		INET			#Internet communications protocols
 options		ISO
diff --git a/sys/conf/files b/sys/conf/files
index 1632549..0ad346b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -101,7 +101,7 @@ kern/vfs_vnops.c	standard
 miscfs/deadfs/dead_vnops.c	standard
 miscfs/fdesc/fdesc_vfsops.c	optional fdesc
 miscfs/fdesc/fdesc_vnops.c	optional fdesc
-miscfs/fifofs/fifo_vnops.c	optional fifo
+miscfs/fifofs/fifo_vnops.c	standard
 miscfs/kernfs/kernfs_vfsops.c	optional kernfs
 miscfs/kernfs/kernfs_vnops.c	optional kernfs
 miscfs/nullfs/null_subr.c	optional nullfs
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 79ee4f4..aa6cd74 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.3 1994/08/02 07:41:19 davidg Exp $
+ * $Id: cd9660_node.c,v 1.4 1994/09/15 19:45:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -289,14 +289,8 @@ loop:
 	vp->v_type = IFTOVT(ip->inode.iso_mode);
 	
 	if ( vp->v_type == VFIFO ) {
-#ifdef	FIFO
 		extern int (**cd9660_fifoop_p)();
 		vp->v_op = cd9660_fifoop_p;
-#else
-		iso_iput(ip);
-		*ipp = 0;
-		return EOPNOTSUPP;
-#endif	/* FIFO */
 	} else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
 		extern int (**cd9660_specop_p)();
 
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index b63f02b..9ca3ed5 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.6 1994/09/15 19:46:03 bde Exp $
+ * $Id: cd9660_vnops.c,v 1.7 1994/09/21 03:46:35 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -992,7 +992,6 @@ struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 VNODEOP_SET(cd9660_specop_opv_desc);
 
-#ifdef FIFO
 int (**cd9660_fifoop_p)();
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -1042,4 +1041,3 @@ struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
 
 VNODEOP_SET(cd9660_fifoop_opv_desc);
-#endif /* FIFO */
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index c57ba91..4074b9e 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,10 +31,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id$
+ * $Id: fifo.h,v 1.2 1994/08/02 07:44:54 davidg Exp $
  */
 
-#ifdef FIFO
 /*
  * Prototypes for fifo operations on vnodes.
  */
@@ -83,4 +82,3 @@ int	fifo_advlock __P((struct vop_advlock_args *));
 #define fifo_truncate ((int (*) __P((struct  vop_truncate_args *)))nullop)
 #define fifo_update ((int (*) __P((struct  vop_update_args *)))nullop)
 #define fifo_bwrite ((int (*) __P((struct  vop_bwrite_args *)))nullop)
-#endif /* FIFO */
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 04022a3..d27cbe1 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.3 1994/08/02 07:44:56 davidg Exp $
+ * $Id: fifo_vnops.c,v 1.4 1994/09/21 03:46:57 wollman Exp $
  */
 
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/namei.h>
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 98f9cc6..8ffdcb4 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.1.1.1 1994/05/24 10:05:03 rgrimes Exp $
+ * $Id: null_vfsops.c,v 1.2 1994/09/21 03:47:01 wollman Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index ede1455..d3680eb 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $
+ * $Id: portal_vfsops.c,v 1.2 1994/09/21 03:47:04 wollman Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/proc.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index dba5d41..c12bb8c 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.2 1994/08/02 07:45:36 davidg Exp $
+ * $Id: umap_vfsops.c,v 1.3 1994/09/21 03:47:11 wollman Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 74e4e99..3cfbd69 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.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.3 1994/08/02 07:45:45 davidg Exp $
+ * $Id: union_vfsops.c,v 1.4 1994/09/21 03:47:13 wollman Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/proc.h>
diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH
index c648ff4..a5e8a38 100644
--- a/sys/i386/conf/GENERICAH
+++ b/sys/i386/conf/GENERICAH
@@ -1,7 +1,7 @@
 #
 # GENERICAH -- Generic machine with WD/AHx/NCR family disks
 #
-#	$Id: GENERICAH,v 1.42 1994/09/16 20:14:00 wollman Exp $
+#	$Id: GENERICAH,v 1.43 1994/09/18 21:18:49 se Exp $
 #
 
 machine		"i386"
@@ -19,7 +19,6 @@ options		NFS			#Network File System
 options		PROCFS			#Process File System
 options		FDESC			#File Descriptor File System
 options		"CD9660"		#CD ISO9660 File System
-options		FIFO			#Support for FIFO files
 options		"COMPAT_43"		#Compatible with BSD 4.3
 #options		"TCP_COMPAT_42"		#TCP/IP compatible with 4.2
 options		UCONSOLE		#X Console support
diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT
index 5e024c7..6849729 100644
--- a/sys/i386/conf/GENERICBT
+++ b/sys/i386/conf/GENERICBT
@@ -1,7 +1,7 @@
 #
 # GENERICBT -- Generic machine with WD/BTx family disks
 #
-#	$Id: GENERICBT,v 1.39 1994/09/09 22:12:37 csgr Exp $
+#	$Id: GENERICBT,v 1.40 1994/09/16 20:14:03 wollman Exp $
 #
 
 machine		"i386"
@@ -19,7 +19,6 @@ options		NFS			#Network File System
 options		PROCFS			#Process File System
 options		FDESC			#/dev/fd file system
 options		"CD9660"		#CD ISO9660 File System
-options		FIFO			#Support for FIFO files
 options		"COMPAT_43"		#Compatible with BSD 4.3
 #options		"TCP_COMPAT_42"		#TCP/IP compatible with 4.2
 options		UCONSOLE		#X Console support
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index d328461..4c0fdec 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.80 1994/09/16 10:23:30 jkh Exp $
+#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
 #
 
 machine		"i386"
@@ -90,7 +90,6 @@ device		ch0
 options		DDB			#Kernel debugger
 options		EON
 pseudo-device	ether
-options		FIFO
 #pseudo-device	imp
 options		INET			#Internet communications protocols
 options		ISO
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d328461..4c0fdec 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.80 1994/09/16 10:23:30 jkh Exp $
+#	$Id: LINT,v 1.81 1994/09/19 15:45:02 dfr Exp $
 #
 
 machine		"i386"
@@ -90,7 +90,6 @@ device		ch0
 options		DDB			#Kernel debugger
 options		EON
 pseudo-device	ether
-options		FIFO
 #pseudo-device	imp
 options		INET			#Internet communications protocols
 options		ISO
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 79ee4f4..aa6cd74 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.3 1994/08/02 07:41:19 davidg Exp $
+ * $Id: cd9660_node.c,v 1.4 1994/09/15 19:45:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -289,14 +289,8 @@ loop:
 	vp->v_type = IFTOVT(ip->inode.iso_mode);
 	
 	if ( vp->v_type == VFIFO ) {
-#ifdef	FIFO
 		extern int (**cd9660_fifoop_p)();
 		vp->v_op = cd9660_fifoop_p;
-#else
-		iso_iput(ip);
-		*ipp = 0;
-		return EOPNOTSUPP;
-#endif	/* FIFO */
 	} else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
 		extern int (**cd9660_specop_p)();
 
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index b63f02b..9ca3ed5 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_vnops.c,v 1.6 1994/09/15 19:46:03 bde Exp $
+ * $Id: cd9660_vnops.c,v 1.7 1994/09/21 03:46:35 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -992,7 +992,6 @@ struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 VNODEOP_SET(cd9660_specop_opv_desc);
 
-#ifdef FIFO
 int (**cd9660_fifoop_p)();
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -1042,4 +1041,3 @@ struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
 
 VNODEOP_SET(cd9660_fifoop_opv_desc);
-#endif /* FIFO */
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 93b0191..4607112 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.6 1994/09/02 10:23:43 davidg Exp $
+ * $Id: vfs_syscalls.c,v 1.7 1994/09/21 03:46:49 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -768,9 +768,6 @@ mkfifo(p, uap, retval)
 	int error;
 	struct nameidata nd;
 
-#ifndef FIFO
-	return (EOPNOTSUPP);
-#else
 	NDINIT(&nd, CREATE, LOCKPARENT, UIO_USERSPACE, uap->path, p);
 	if (error = namei(&nd))
 		return (error);
@@ -788,7 +785,6 @@ mkfifo(p, uap, retval)
 	vattr.va_mode = (uap->mode & ALLPERMS) &~ p->p_fd->fd_cmask;
 	LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
 	return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
-#endif /* FIFO */
 }
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 93b0191..4607112 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.6 1994/09/02 10:23:43 davidg Exp $
+ * $Id: vfs_syscalls.c,v 1.7 1994/09/21 03:46:49 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -768,9 +768,6 @@ mkfifo(p, uap, retval)
 	int error;
 	struct nameidata nd;
 
-#ifndef FIFO
-	return (EOPNOTSUPP);
-#else
 	NDINIT(&nd, CREATE, LOCKPARENT, UIO_USERSPACE, uap->path, p);
 	if (error = namei(&nd))
 		return (error);
@@ -788,7 +785,6 @@ mkfifo(p, uap, retval)
 	vattr.va_mode = (uap->mode & ALLPERMS) &~ p->p_fd->fd_cmask;
 	LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
 	return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
-#endif /* FIFO */
 }
 
 /*
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index c57ba91..4074b9e 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,10 +31,9 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id$
+ * $Id: fifo.h,v 1.2 1994/08/02 07:44:54 davidg Exp $
  */
 
-#ifdef FIFO
 /*
  * Prototypes for fifo operations on vnodes.
  */
@@ -83,4 +82,3 @@ int	fifo_advlock __P((struct vop_advlock_args *));
 #define fifo_truncate ((int (*) __P((struct  vop_truncate_args *)))nullop)
 #define fifo_update ((int (*) __P((struct  vop_update_args *)))nullop)
 #define fifo_bwrite ((int (*) __P((struct  vop_bwrite_args *)))nullop)
-#endif /* FIFO */
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 04022a3..d27cbe1 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.3 1994/08/02 07:44:56 davidg Exp $
+ * $Id: fifo_vnops.c,v 1.4 1994/09/21 03:46:57 wollman Exp $
  */
 
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/namei.h>
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 56e1989..fe1341b 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.4 (Berkeley) 1/21/94
- * $Id: kernfs_vfsops.c,v 1.3 1994/08/02 07:45:02 davidg Exp $
+ * $Id: kernfs_vfsops.c,v 1.4 1994/09/21 03:46:59 wollman Exp $
  */
 
 /*
@@ -43,6 +43,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/types.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 98f9cc6..8ffdcb4 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.1.1.1 1994/05/24 10:05:03 rgrimes Exp $
+ * $Id: null_vfsops.c,v 1.2 1994/09/21 03:47:01 wollman Exp $
  */
 
 /*
@@ -46,6 +46,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index ede1455..d3680eb 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.1.1.1 1994/05/24 10:05:06 rgrimes Exp $
+ * $Id: portal_vfsops.c,v 1.2 1994/09/21 03:47:04 wollman Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index dba5d41..c12bb8c 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.2 1994/08/02 07:45:36 davidg Exp $
+ * $Id: umap_vfsops.c,v 1.3 1994/09/21 03:47:11 wollman Exp $
  */
 
 /*
@@ -45,6 +45,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vnode.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index 74e4e99..3cfbd69 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.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.3 1994/08/02 07:45:45 davidg Exp $
+ * $Id: union_vfsops.c,v 1.4 1994/09/21 03:47:13 wollman Exp $
  */
 
 /*
@@ -44,6 +44,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/proc.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index f4e9cbf..4f6d7e7 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id$
+ * $Id: nfs_subs.c,v 1.3 1994/08/02 07:52:13 davidg Exp $
  */
 
 /*
@@ -705,12 +705,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		else
 			vp->v_type = vtyp;
 		if (vp->v_type == VFIFO) {
-#ifdef FIFO
 			extern int (**fifo_nfsv2nodeop_p)();
 			vp->v_op = fifo_nfsv2nodeop_p;
-#else
-			return (EOPNOTSUPP);
-#endif /* FIFO */
 		}
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
 			vp->v_op = spec_nfsv2nodeop_p;
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 0184b27..55897c4 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.3 1994/08/02 07:52:09 davidg Exp $
+ * $Id: nfs_serv.c,v 1.4 1994/08/29 06:09:06 davidg Exp $
  */
 
 /*
@@ -736,12 +736,6 @@ nfsrv_create(nfsd, mrep, md, dpos, cred, nam, mrq)
 			if (vap->va_type == VCHR && rdev == 0xffffffff)
 				vap->va_type = VFIFO;
 			if (vap->va_type == VFIFO) {
-#ifndef FIFO
-				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-				vput(nd.ni_dvp);
-				error = ENXIO;
-				goto out;
-#endif /* FIFO */
 			} else if (error = suser(cred, (u_short *)0)) {
 				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 				vput(nd.ni_dvp);
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index f4e9cbf..4f6d7e7 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id$
+ * $Id: nfs_subs.c,v 1.3 1994/08/02 07:52:13 davidg Exp $
  */
 
 /*
@@ -705,12 +705,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		else
 			vp->v_type = vtyp;
 		if (vp->v_type == VFIFO) {
-#ifdef FIFO
 			extern int (**fifo_nfsv2nodeop_p)();
 			vp->v_op = fifo_nfsv2nodeop_p;
-#else
-			return (EOPNOTSUPP);
-#endif /* FIFO */
 		}
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
 			vp->v_op = spec_nfsv2nodeop_p;
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 015ffbd..3949870 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.5 1994/08/29 06:09:08 davidg Exp $
+ * $Id: nfs_vnops.c,v 1.6 1994/09/21 03:47:25 wollman Exp $
  */
 
 /*
@@ -180,7 +180,6 @@ struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 	{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
 VNODEOP_SET(spec_nfsv2nodeop_opv_desc);
 
-#ifdef FIFO
 int (**fifo_nfsv2nodeop_p)();
 struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -230,7 +229,6 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
 	{ &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
 VNODEOP_SET(fifo_nfsv2nodeop_opv_desc);
-#endif /* FIFO */
 
 void nqnfs_clientlease();
 
@@ -965,10 +963,8 @@ nfs_mknod(ap)
 	isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
 	if (vap->va_type == VCHR || vap->va_type == VBLK)
 		rdev = txdr_unsigned(vap->va_rdev);
-#ifdef FIFO
 	else if (vap->va_type == VFIFO)
 		rdev = 0xffffffff;
-#endif /* FIFO */
 	else {
 		VOP_ABORTOP(dvp, cnp);
 		vput(dvp);
@@ -2228,10 +2224,8 @@ nfs_print(ap)
 
 	printf("tag VT_NFS, fileid %d fsid 0x%x",
 		np->n_vattr.va_fileid, np->n_vattr.va_fsid);
-#ifdef FIFO
 	if (vp->v_type == VFIFO)
 		fifo_printinfo(vp);
-#endif /* FIFO */
 	printf("\n");
 	return (0);
 }
@@ -2455,7 +2449,6 @@ nfsspec_close(ap)
 	return (VOCALL(spec_vnodeop_p, VOFFSET(vop_close), ap));
 }
 
-#ifdef FIFO
 /*
  * Read wrapper for fifos.
  */
@@ -2545,4 +2538,3 @@ nfsfifo_close(ap)
 	}
 	return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_close), ap));
 }
-#endif /* FIFO */
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 0eb12b3..f0b586a 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.4 1994/08/09 15:10:14 davidg Exp $
+ * $Id: nfsnode.h,v 1.5 1994/08/21 06:50:11 paul Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -119,9 +119,7 @@ int	nfs_mknod __P((struct vop_mknod_args *));
 int	nfs_open __P((struct vop_open_args *));
 int	nfs_close __P((struct vop_close_args *));
 int	nfsspec_close __P((struct vop_close_args *));
-#ifdef FIFO
 int	nfsfifo_close __P((struct vop_close_args *));
-#endif
 int	nfs_access __P((struct vop_access_args *));
 int	nfsspec_access __P((struct vop_access_args *));
 int	nfs_getattr __P((struct vop_getattr_args *));
@@ -130,10 +128,8 @@ int	nfs_read __P((struct vop_read_args *));
 int	nfs_write __P((struct vop_write_args *));
 int	nfsspec_read __P((struct vop_read_args *));
 int	nfsspec_write __P((struct vop_write_args *));
-#ifdef FIFO
 int	nfsfifo_read __P((struct vop_read_args *));
 int	nfsfifo_write __P((struct vop_write_args *));
-#endif
 #define nfs_ioctl ((int (*) __P((struct  vop_ioctl_args *)))enoioctl)
 #define nfs_select ((int (*) __P((struct  vop_select_args *)))seltrue)
 int	nfs_mmap __P((struct vop_mmap_args *));
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index f4e9cbf..4f6d7e7 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id$
+ * $Id: nfs_subs.c,v 1.3 1994/08/02 07:52:13 davidg Exp $
  */
 
 /*
@@ -705,12 +705,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		else
 			vp->v_type = vtyp;
 		if (vp->v_type == VFIFO) {
-#ifdef FIFO
 			extern int (**fifo_nfsv2nodeop_p)();
 			vp->v_op = fifo_nfsv2nodeop_p;
-#else
-			return (EOPNOTSUPP);
-#endif /* FIFO */
 		}
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
 			vp->v_op = spec_nfsv2nodeop_p;
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 015ffbd..3949870 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.5 1994/08/29 06:09:08 davidg Exp $
+ * $Id: nfs_vnops.c,v 1.6 1994/09/21 03:47:25 wollman Exp $
  */
 
 /*
@@ -180,7 +180,6 @@ struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
 	{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
 VNODEOP_SET(spec_nfsv2nodeop_opv_desc);
 
-#ifdef FIFO
 int (**fifo_nfsv2nodeop_p)();
 struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
@@ -230,7 +229,6 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
 	{ &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
 VNODEOP_SET(fifo_nfsv2nodeop_opv_desc);
-#endif /* FIFO */
 
 void nqnfs_clientlease();
 
@@ -965,10 +963,8 @@ nfs_mknod(ap)
 	isnq = (VFSTONFS(dvp->v_mount)->nm_flag & NFSMNT_NQNFS);
 	if (vap->va_type == VCHR || vap->va_type == VBLK)
 		rdev = txdr_unsigned(vap->va_rdev);
-#ifdef FIFO
 	else if (vap->va_type == VFIFO)
 		rdev = 0xffffffff;
-#endif /* FIFO */
 	else {
 		VOP_ABORTOP(dvp, cnp);
 		vput(dvp);
@@ -2228,10 +2224,8 @@ nfs_print(ap)
 
 	printf("tag VT_NFS, fileid %d fsid 0x%x",
 		np->n_vattr.va_fileid, np->n_vattr.va_fsid);
-#ifdef FIFO
 	if (vp->v_type == VFIFO)
 		fifo_printinfo(vp);
-#endif /* FIFO */
 	printf("\n");
 	return (0);
 }
@@ -2455,7 +2449,6 @@ nfsspec_close(ap)
 	return (VOCALL(spec_vnodeop_p, VOFFSET(vop_close), ap));
 }
 
-#ifdef FIFO
 /*
  * Read wrapper for fifos.
  */
@@ -2545,4 +2538,3 @@ nfsfifo_close(ap)
 	}
 	return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_close), ap));
 }
-#endif /* FIFO */
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 0eb12b3..f0b586a 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.4 1994/08/09 15:10:14 davidg Exp $
+ * $Id: nfsnode.h,v 1.5 1994/08/21 06:50:11 paul Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -119,9 +119,7 @@ int	nfs_mknod __P((struct vop_mknod_args *));
 int	nfs_open __P((struct vop_open_args *));
 int	nfs_close __P((struct vop_close_args *));
 int	nfsspec_close __P((struct vop_close_args *));
-#ifdef FIFO
 int	nfsfifo_close __P((struct vop_close_args *));
-#endif
 int	nfs_access __P((struct vop_access_args *));
 int	nfsspec_access __P((struct vop_access_args *));
 int	nfs_getattr __P((struct vop_getattr_args *));
@@ -130,10 +128,8 @@ int	nfs_read __P((struct vop_read_args *));
 int	nfs_write __P((struct vop_write_args *));
 int	nfsspec_read __P((struct vop_read_args *));
 int	nfsspec_write __P((struct vop_write_args *));
-#ifdef FIFO
 int	nfsfifo_read __P((struct vop_read_args *));
 int	nfsfifo_write __P((struct vop_write_args *));
-#endif
 #define nfs_ioctl ((int (*) __P((struct  vop_ioctl_args *)))enoioctl)
 #define nfs_select ((int (*) __P((struct  vop_select_args *)))seltrue)
 int	nfs_mmap __P((struct vop_mmap_args *));
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 0184b27..55897c4 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.3 1994/08/02 07:52:09 davidg Exp $
+ * $Id: nfs_serv.c,v 1.4 1994/08/29 06:09:06 davidg Exp $
  */
 
 /*
@@ -736,12 +736,6 @@ nfsrv_create(nfsd, mrep, md, dpos, cred, nam, mrq)
 			if (vap->va_type == VCHR && rdev == 0xffffffff)
 				vap->va_type = VFIFO;
 			if (vap->va_type == VFIFO) {
-#ifndef FIFO
-				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-				vput(nd.ni_dvp);
-				error = ENXIO;
-				goto out;
-#endif /* FIFO */
 			} else if (error = suser(cred, (u_short *)0)) {
 				VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
 				vput(nd.ni_dvp);
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index f4e9cbf..4f6d7e7 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id$
+ * $Id: nfs_subs.c,v 1.3 1994/08/02 07:52:13 davidg Exp $
  */
 
 /*
@@ -705,12 +705,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		else
 			vp->v_type = vtyp;
 		if (vp->v_type == VFIFO) {
-#ifdef FIFO
 			extern int (**fifo_nfsv2nodeop_p)();
 			vp->v_op = fifo_nfsv2nodeop_p;
-#else
-			return (EOPNOTSUPP);
-#endif /* FIFO */
 		}
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
 			vp->v_op = spec_nfsv2nodeop_p;
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;