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.

3 files changed, 3 insertions, 19 deletions

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 *));