From 900d29807dafc6f0cf9a730ae1f46bcca5d00f3d Mon Sep 17 00:00:00 2001
From: wollman <wollman@FreeBSD.org>
Date: Thu, 22 Sep 1994 19:38:41 +0000
Subject: 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.
---
 sys/isofs/cd9660/cd9660_node.c  | 8 +-------
 sys/isofs/cd9660/cd9660_vnops.c | 4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'sys/isofs')

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 */
-- 
cgit v1.1