Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always include fifos; "not an option any more".

Browse Source
This commit is contained in:
sommerfe 1998-06-24 20:58:44 +00:00
parent eb5a542716
commit 7ba7fbbb23
26 changed files with 39 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.157 1998/06/24 05:38:09 bouyer Exp $
# $NetBSD: GENERIC,v 1.158 1998/06/24 20:58:44 sommerfe Exp $
#
# GENERIC -- everything that's currently supported
#
@ -103,7 +103,7 @@ file-system UNION # union file system
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independant support
options NFSSERVER # Network File System server
options FIFO # FIFOs; RECOMMENDED
#options FIFO # FIFOs; RECOMMENDED
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.

6
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.194 1998/06/24 10:52:53 jonathan Exp $
# $NetBSD: files,v 1.195 1998/06/24 20:58:44 sommerfe Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -14,7 +14,7 @@ defopt DEVPAGER
defopt SWAPPAGER
defopt VNODEPAGER
defopt FIFO
# defopt FIFO # No longer optional
defopt opt_ntp.h PPS_SYNC NTP
@ -391,7 +391,7 @@ file kern/vnode_if.c
file miscfs/deadfs/dead_vnops.c
file miscfs/fdesc/fdesc_vfsops.c fdesc
file miscfs/fdesc/fdesc_vnops.c fdesc
file miscfs/fifofs/fifo_vnops.c fifo
file miscfs/fifofs/fifo_vnops.c
file miscfs/genfs/genfs_vnops.c
file miscfs/kernfs/kernfs_vfsops.c kernfs
file miscfs/kernfs/kernfs_vnops.c kernfs

8
sys/isofs/cd9660/cd9660_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_extern.h,v 1.3 1998/06/22 22:01:03 sommerfe Exp $ */
/* $NetBSD: cd9660_extern.h,v 1.4 1998/06/24 20:58:45 sommerfe Exp $ */
/*-
* Copyright (c) 1994
@ -40,10 +40,6 @@
* @(#)iso.h 8.4 (Berkeley) 12/5/94
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
/*
* Definitions used in the kernel for cd9660 file system support.
*/
@ -105,9 +101,7 @@ int cd9660_mountroot __P((void));
extern int (**cd9660_vnodeop_p) __P((void *));
extern int (**cd9660_specop_p) __P((void *));
#ifdef FIFO
extern int (**cd9660_fifoop_p) __P((void *));
#endif
int isofncmp __P((const u_char *, int, const u_char *, int));
void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));

15
sys/isofs/cd9660/cd9660_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.29 1998/06/22 22:01:03 sommerfe Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.30 1998/06/24 20:58:45 sommerfe Exp $ */
/*-
* Copyright (c) 1994
@ -40,10 +40,6 @@
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@ -69,16 +65,12 @@
extern struct vnodeopv_desc cd9660_vnodeop_opv_desc;
extern struct vnodeopv_desc cd9660_specop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc cd9660_fifoop_opv_desc;
#endif
struct vnodeopv_desc *cd9660_vnodeopv_descs[] = {
&cd9660_vnodeop_opv_desc,
&cd9660_specop_opv_desc,
#ifdef FIFO
&cd9660_fifoop_opv_desc,
#endif
NULL,
};
@ -759,13 +751,8 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
*/
switch (vp->v_type = IFTOVT(ip->inode.iso_mode)) {
case VFIFO:
#ifdef FIFO
vp->v_op = cd9660_fifoop_p;
break;
#else
vput(vp);
return (EOPNOTSUPP);
#endif /* FIFO */
case VCHR:
case VBLK:
/*

10
sys/isofs/cd9660/cd9660_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vnops.c,v 1.45 1998/06/22 22:01:03 sommerfe Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.46 1998/06/24 20:58:45 sommerfe Exp $ */
/*-
* Copyright (c) 1994
@ -40,10 +40,6 @@
* @(#)cd9660_vnops.c 8.15 (Berkeley) 5/27/95
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@ -933,9 +929,7 @@ cd9660_setattr(v)
if (vap->va_size != VNOVAL
&& vp->v_type != VCHR
&& vp->v_type != VBLK
#ifdef FIFO
&& vp->v_type != VFIFO
#endif
)
return EOPNOTSUPP;
@ -1073,7 +1067,6 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
struct vnodeopv_desc cd9660_specop_opv_desc =
{ &cd9660_specop_p, cd9660_specop_entries };
#ifdef FIFO
int (**cd9660_fifoop_p) __P((void *));
struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
{ &vop_default_desc, vn_default_error },
@ -1123,4 +1116,3 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
};
struct vnodeopv_desc cd9660_fifoop_opv_desc =
{ &cd9660_fifoop_p, cd9660_fifoop_entries };
#endif /* FIFO */

8
sys/kern/vfs_init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_init.c,v 1.12 1998/06/22 22:01:04 sommerfe Exp $ */
/* $NetBSD: vfs_init.c,v 1.13 1998/06/24 20:58:45 sommerfe Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,8 +77,6 @@
* @(#)vfs_init.c 8.5 (Berkeley) 5/11/95
*/
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/mount.h>
#include <sys/time.h>
@ -111,16 +109,12 @@ extern struct vnodeop_desc *vfs_op_descs[];
* be initialized by vfs_attach().
*/
extern struct vnodeopv_desc dead_vnodeop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc fifo_vnodeop_opv_desc;
#endif
extern struct vnodeopv_desc spec_vnodeop_opv_desc;
struct vnodeopv_desc *vfs_special_vnodeopv_descs[] = {
&dead_vnodeop_opv_desc,
#ifdef FIFO
&fifo_vnodeop_opv_desc,
#endif
&spec_vnodeop_opv_desc,
NULL,
};

12
sys/kern/vfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_syscalls.c,v 1.118 1998/06/22 22:01:04 sommerfe Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.119 1998/06/24 20:58:46 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1993
@ -41,7 +41,6 @@
*/
#include "opt_uvm.h"
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -970,9 +969,6 @@ sys_mkfifo(p, v, retval)
void *v;
register_t *retval;
{
#ifndef FIFO
return (EOPNOTSUPP);
#else
register struct sys_mkfifo_args /* {
syscallarg(const char *) path;
syscallarg(int) mode;
@ -998,7 +994,6 @@ sys_mkfifo(p, v, retval)
vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ p->p_fd->fd_cmask;
VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
#endif /* FIFO */
}
/*
@ -1208,10 +1203,7 @@ sys_lseek(p, v, retval)
vp = (struct vnode *)fp->f_data;
if (fp->f_type != DTYPE_VNODE
#ifdef FIFO
|| vp->v_type == VFIFO
#endif
)
|| vp->v_type == VFIFO)
return (ESPIPE);
switch (SCARG(uap, whence)) {

10
sys/miscfs/fifofs/fifo.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: fifo.h,v 1.14 1998/06/22 22:01:05 sommerfe Exp $ */
/* $NetBSD: fifo.h,v 1.15 1998/06/24 20:58:46 sommerfe Exp $ */
/*
* Copyright (c) 1991, 1993
@ -35,12 +35,6 @@
* @(#)fifo.h 8.6 (Berkeley) 5/21/95
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
#ifdef FIFO
/*
* Prototypes for fifo operations on vnodes.
*/
@ -91,5 +85,3 @@ int fifo_pathconf __P((void *));
void fifo_printinfo __P((struct vnode *));
extern int (**fifo_vnodeop_p) __P((void *));
#endif /* FIFO */

7
sys/nfs/nfs_subs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.59 1998/06/22 22:01:05 sommerfe Exp $ */
/* $NetBSD: nfs_subs.c,v 1.60 1998/06/24 20:58:46 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1993
@ -40,7 +40,6 @@
#include "fs_nfs.h"
#include "opt_uvm.h"
#include "opt_fifo.h"
/*
* These functions support the macros and help fiddle mbuf chains for
@ -1561,12 +1560,8 @@ nfs_loadattrcache(vpp, fp, vaper)
if (vp->v_type != vtyp) {
vp->v_type = vtyp;
if (vp->v_type == VFIFO) {
#ifndef FIFO
return (EOPNOTSUPP);
#else
extern int (**fifo_nfsv2nodeop_p) __P((void *));
vp->v_op = fifo_nfsv2nodeop_p;
#endif /* FIFO */
}
if (vp->v_type == VCHR || vp->v_type == VBLK) {
vp->v_op = spec_nfsv2nodeop_p;

8
sys/nfs/nfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vfsops.c,v 1.74 1998/06/22 22:01:06 sommerfe Exp $ */
/* $NetBSD: nfs_vfsops.c,v 1.75 1998/06/24 20:58:46 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@ -38,8 +38,6 @@
* @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95
*/
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>
@ -83,16 +81,12 @@ int nfs_sysctl __P((int *, u_int, void *, size_t *, void *, size_t,
extern struct vnodeopv_desc nfsv2_vnodeop_opv_desc;
extern struct vnodeopv_desc spec_nfsv2nodeop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc;
#endif
struct vnodeopv_desc *nfs_vnodeopv_descs[] = {
&nfsv2_vnodeop_opv_desc,
&spec_nfsv2nodeop_opv_desc,
#ifdef FIFO
&fifo_nfsv2nodeop_opv_desc,
#endif
NULL,
};

9
sys/nfs/nfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_vnops.c,v 1.93 1998/06/22 22:01:07 sommerfe Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.94 1998/06/24 20:58:47 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1993
@ -39,7 +39,6 @@
*/
#include "opt_uvm.h"
#include "opt_fifo.h"
/*
* vnode op calls for Sun NFS version 2 and 3
@ -199,7 +198,6 @@ struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
#ifdef FIFO
int (**fifo_nfsv2nodeop_p) __P((void *));
struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
@ -250,7 +248,6 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
};
struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
{ &fifo_nfsv2nodeop_p, fifo_nfsv2nodeop_entries };
#endif /* FIFO */
/*
* Global variables
@ -3021,10 +3018,8 @@ nfs_print(v)
printf("tag VT_NFS, fileid %ld fsid 0x%lx",
np->n_vattr->va_fileid, np->n_vattr->va_fsid);
#ifdef FIFO
if (vp->v_type == VFIFO)
fifo_printinfo(vp);
#endif
printf("\n");
return (0);
}
@ -3279,7 +3274,6 @@ nfsspec_close(v)
return (VOCALL(spec_vnodeop_p, VOFFSET(vop_close), ap));
}
#ifdef FIFO
/*
* Read wrapper for fifos.
*/
@ -3372,4 +3366,3 @@ nfsfifo_close(v)
}
return (VOCALL(fifo_vnodeop_p, VOFFSET(vop_close), ap));
}
#endif /* ! FIFO */

12
sys/ufs/ext2fs/ext2fs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_extern.h,v 1.4 1998/06/23 23:15:50 sommerfe Exp $ */
/* $NetBSD: ext2fs_extern.h,v 1.5 1998/06/24 20:58:47 sommerfe Exp $ */
/*-
* Copyright (c) 1997 Manuel Bouyer.
@ -37,10 +37,6 @@
* Modified for ext2fs by Manuel Bouyer.
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
struct buf;
struct fid;
struct m_ext2fs;
@ -152,9 +148,5 @@ __END_DECLS
extern int (**ext2fs_vnodeop_p) __P((void *));
extern int (**ext2fs_specop_p) __P((void *));
#ifdef FIFO
extern int (**ext2fs_fifoop_p) __P((void *));
#define EXT2FS_FIFOOPS ext2fs_fifoop_p
#else
#define EXT2FS_FIFOOPS NULL
#endif

10
sys/ufs/ext2fs/ext2fs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vfsops.c,v 1.13 1998/06/22 22:01:08 sommerfe Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.14 1998/06/24 20:58:47 sommerfe Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -37,8 +37,6 @@
* Modified for ext2fs by Manuel Bouyer.
*/
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@ -76,16 +74,12 @@ int ext2fs_check_export __P((struct mount *, struct ufid *, struct mbuf *,
extern struct vnodeopv_desc ext2fs_vnodeop_opv_desc;
extern struct vnodeopv_desc ext2fs_specop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc ext2fs_fifoop_opv_desc;
#endif
struct vnodeopv_desc *ext2fs_vnodeopv_descs[] = {
&ext2fs_vnodeop_opv_desc,
&ext2fs_specop_opv_desc,
#ifdef FIFO
&ext2fs_fifoop_opv_desc,
#endif
NULL,
};
@ -924,7 +918,7 @@ ext2fs_vget(mp, ino, vpp)
* Initialize the vnode from the inode, check for aliases.
* Note that the underlying vnode may have changed.
*/
error = ext2fs_vinit(mp, ext2fs_specop_p, EXT2FS_FIFOOPS, &vp);
error = ext2fs_vinit(mp, ext2fs_specop_p, ext2fs_fifoop_p, &vp);
if (error) {
vput(vp);
*vpp = NULL;

9
sys/ufs/ext2fs/ext2fs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vnops.c,v 1.10 1998/06/22 22:01:08 sommerfe Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.11 1998/06/24 20:58:47 sommerfe Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -43,7 +43,6 @@
*/
#include "opt_uvm.h"
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -1297,12 +1296,8 @@ ext2fs_vinit(mntp, specops, fifoops, vpp)
}
break;
case VFIFO:
#ifdef FIFO
vp->v_op = fifoops;
break;
#else
return (EOPNOTSUPP);
#endif
case VNON:
case VBAD:
case VSOCK:
@ -1527,7 +1522,6 @@ struct vnodeopv_entry_desc ext2fs_specop_entries[] = {
struct vnodeopv_desc ext2fs_specop_opv_desc =
{ &ext2fs_specop_p, ext2fs_specop_entries };
#ifdef FIFO
int (**ext2fs_fifoop_p) __P((void *));
struct vnodeopv_entry_desc ext2fs_fifoop_entries[] = {
{ &vop_default_desc, vn_default_error },
@ -1577,4 +1571,3 @@ struct vnodeopv_entry_desc ext2fs_fifoop_entries[] = {
};
struct vnodeopv_desc ext2fs_fifoop_opv_desc =
{ &ext2fs_fifoop_p, ext2fs_fifoop_entries };
#endif /* FIFO */

13
sys/ufs/ffs/ffs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_extern.h,v 1.9 1998/06/22 22:01:08 sommerfe Exp $ */
/* $NetBSD: ffs_extern.h,v 1.10 1998/06/24 20:58:47 sommerfe Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -35,10 +35,6 @@
* @(#)ffs_extern.h 8.6 (Berkeley) 3/30/95
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
/*
* Sysctl values for the fast filesystem.
*/
@ -140,9 +136,6 @@ __END_DECLS
extern int (**ffs_vnodeop_p) __P((void *));
extern int (**ffs_specop_p) __P((void *));
#ifdef FIFO
extern int (**ffs_fifoop_p) __P((void *));
#define FFS_FIFOOPS ffs_fifoop_p
#else
#define FFS_FIFOOPS NULL
#endif

9
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.39 1998/06/22 22:01:09 sommerfe Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.40 1998/06/24 20:58:48 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -37,7 +37,6 @@
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_quota.h"
#include "opt_fifo.h"
#endif
#include <sys/param.h>
@ -78,16 +77,12 @@ int ffs_sbupdate __P((struct ufsmount *, int));
extern struct vnodeopv_desc ffs_vnodeop_opv_desc;
extern struct vnodeopv_desc ffs_specop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc ffs_fifoop_opv_desc;
#endif
struct vnodeopv_desc *ffs_vnodeopv_descs[] = {
&ffs_vnodeop_opv_desc,
&ffs_specop_opv_desc,
#ifdef FIFO
&ffs_fifoop_opv_desc,
#endif
NULL,
};
@ -923,7 +918,7 @@ ffs_vget(mp, ino, vpp)
* Initialize the vnode from the inode, check for aliases.
* Note that the underlying vnode may have changed.
*/
error = ufs_vinit(mp, ffs_specop_p, FFS_FIFOOPS, &vp);
error = ufs_vinit(mp, ffs_specop_p, ffs_fifoop_p, &vp);
if (error) {
vput(vp);
*vpp = NULL;

5
sys/ufs/ffs/ffs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vnops.c,v 1.14 1998/06/22 22:01:09 sommerfe Exp $ */
/* $NetBSD: ffs_vnops.c,v 1.15 1998/06/24 20:58:48 sommerfe Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -37,7 +37,6 @@
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_uvm.h"
#include "opt_fifo.h"
#endif
#include <sys/param.h>
@ -177,7 +176,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) __P((void *));
struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
{ &vop_default_desc, vn_default_error },
@ -228,7 +226,6 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
};
struct vnodeopv_desc ffs_fifoop_opv_desc =
{ &ffs_fifoop_p, ffs_fifoop_entries };
#endif /* FIFO */
int doclusterread = 1;
int doclusterwrite = 1;

4
sys/ufs/lfs/lfs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_alloc.c,v 1.13 1998/06/09 07:46:33 scottr Exp $ */
/* $NetBSD: lfs_alloc.c,v 1.14 1998/06/24 20:58:48 sommerfe Exp $ */
/*
* Copyright (c) 1991, 1993
@ -143,7 +143,7 @@ lfs_valloc(v)
/* Insert into the inode hash table. */
ufs_ihashins(ip);
error = ufs_vinit(vp->v_mount, lfs_specop_p, LFS_FIFOOPS, &vp);
error = ufs_vinit(vp->v_mount, lfs_specop_p, lfs_fifoop_p, &vp);
if (error) {
vput(vp);
*ap->a_vpp = NULL;

10
sys/ufs/lfs/lfs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_extern.h,v 1.8 1998/06/22 22:01:09 sommerfe Exp $ */
/* $NetBSD: lfs_extern.h,v 1.9 1998/06/24 20:58:48 sommerfe Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -35,8 +35,6 @@
* @(#)lfs_extern.h 8.6 (Berkeley) 5/8/95
*/
#include "opt_fifo.h"
struct fid;
struct mount;
struct nameidata;
@ -150,9 +148,5 @@ __END_DECLS
extern int lfs_mount_type;
extern int (**lfs_vnodeop_p) __P((void *));
extern int (**lfs_specop_p) __P((void *));
#ifdef FIFO
extern int (**lfs_fifoop_p) __P((void *));
#define LFS_FIFOOPS lfs_fifoop_p
#else
#define LFS_FIFOOPS NULL
#endif

4
sys/ufs/lfs/lfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_syscalls.c,v 1.17 1998/06/09 07:46:33 scottr Exp $ */
/* $NetBSD: lfs_syscalls.c,v 1.18 1998/06/24 20:58:48 sommerfe Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -555,7 +555,7 @@ lfs_fastvget(mp, ino, daddr, vpp, dinp)
* Initialize the vnode from the inode, check for aliases. In all
* cases re-init ip, the underlying vnode/inode may have changed.
*/
error = ufs_vinit(mp, lfs_specop_p, LFS_FIFOOPS, &vp);
error = ufs_vinit(mp, lfs_specop_p, lfs_fifoop_p, &vp);
if (error) {
lfs_vunref(vp);
*vpp = NULL;

9
sys/ufs/lfs/lfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vfsops.c,v 1.21 1998/06/22 22:01:10 sommerfe Exp $ */
/* $NetBSD: lfs_vfsops.c,v 1.22 1998/06/24 20:58:48 sommerfe Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -37,7 +37,6 @@
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_quota.h"
#include "opt_fifo.h"
#endif
#include <sys/param.h>
@ -70,16 +69,12 @@ int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
extern struct vnodeopv_desc lfs_vnodeop_opv_desc;
extern struct vnodeopv_desc lfs_specop_opv_desc;
#ifdef FIFO
extern struct vnodeopv_desc lfs_fifoop_opv_desc;
#endif
struct vnodeopv_desc *lfs_vnodeopv_descs[] = {
&lfs_vnodeop_opv_desc,
&lfs_specop_opv_desc,
#ifdef FIFO
&lfs_fifoop_opv_desc,
#endif
NULL,
};
@ -601,7 +596,7 @@ lfs_vget(mp, ino, vpp)
* Initialize the vnode from the inode, check for aliases. In all
* cases re-init ip, the underlying vnode/inode may have changed.
*/
error = ufs_vinit(mp, lfs_specop_p, LFS_FIFOOPS, &vp);
error = ufs_vinit(mp, lfs_specop_p, lfs_fifoop_p, &vp);
if (error) {
vput(vp);
*vpp = NULL;

6
sys/ufs/lfs/lfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vnops.c,v 1.17 1998/06/22 22:01:10 sommerfe Exp $ */
/* $NetBSD: lfs_vnops.c,v 1.18 1998/06/24 20:58:48 sommerfe Exp $ */
/*
* Copyright (c) 1986, 1989, 1991, 1993, 1995
@ -35,8 +35,6 @@
* @(#)lfs_vnops.c 8.13 (Berkeley) 6/10/95
*/
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
@ -169,7 +167,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) __P((void *));
struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
{ &vop_default_desc, vn_default_error },
@ -219,7 +216,6 @@ struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
};
struct vnodeopv_desc lfs_fifoop_opv_desc =
{ &lfs_fifoop_p, lfs_fifoop_entries };
#endif /* FIFO */
#define LFS_READWRITE
#include <ufs/ufs/ufs_readwrite.c>

8
sys/ufs/ufs/ufs_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_extern.h,v 1.12 1998/06/22 22:01:11 sommerfe Exp $ */
/* $NetBSD: ufs_extern.h,v 1.13 1998/06/24 20:58:49 sommerfe Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -35,10 +35,6 @@
* @(#)ufs_extern.h 8.10 (Berkeley) 5/14/95
*/
#if defined(_KERNEL) && !defined(_LKM)
#include "opt_fifo.h"
#endif
struct buf;
struct componentname;
struct direct;
@ -102,11 +98,9 @@ int ufsspec_close __P((void *));
int ufsspec_read __P((void *));
int ufsspec_write __P((void *));
#ifdef FIFO
int ufsfifo_read __P((void *));
int ufsfifo_write __P((void *));
int ufsfifo_close __P((void *));
#endif
/* ufs_bmap.c */
int ufs_bmaparray __P((struct vnode *, ufs_daddr_t, ufs_daddr_t *,

11
sys/ufs/ufs/ufs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_vnops.c,v 1.42 1998/06/22 22:01:11 sommerfe Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.43 1998/06/24 20:58:49 sommerfe Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993, 1995
@ -42,7 +42,6 @@
#include "opt_quota.h"
#include "opt_uvm.h"
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -1698,10 +1697,8 @@ ufs_print(v)
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 */
lockmgr_printinfo(&ip->i_lock);
printf("\n");
return (0);
@ -1777,7 +1774,6 @@ ufsspec_close(v)
return (VOCALL (spec_vnodeop_p, VOFFSET(vop_close), ap));
}
#ifdef FIFO
/*
* Read wrapper for fifo's
*/
@ -1850,7 +1846,6 @@ ufsfifo_close(v)
simple_unlock(&vp->v_interlock);
return (VOCALL (fifo_vnodeop_p, VOFFSET(vop_close), ap));
}
#endif /* FIFO */
/*
* Return POSIX pathconf information applicable to ufs filesystems.
@ -1951,12 +1946,8 @@ ufs_vinit(mntp, specops, fifoops, vpp)
}
break;
case VFIFO:
#ifdef FIFO
vp->v_op = fifoops;
break;
#else
return (EOPNOTSUPP);
#endif
case VNON:
case VBAD:
case VSOCK:

7
sys/uvm/uvm_vnode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_vnode.c,v 1.11 1998/06/22 22:01:12 sommerfe Exp $ */
/* $NetBSD: uvm_vnode.c,v 1.12 1998/06/24 20:58:49 sommerfe Exp $ */
/*
* XXXCDC: "ROUGH DRAFT" QUALITY UVM PRE-RELEASE FILE!
@ -51,7 +51,6 @@
#include "fs_nfs.h"
#include "opt_uvmhist.h"
#include "opt_fifo.h"
/*
* uvm_vnode.c: the vnode pager.
@ -1805,20 +1804,16 @@ uvm_vnp_uncache(vp)
#ifdef NFS
extern int (**nfsv2_vnodeop_p) __P((void *));
extern int (**spec_nfsv2nodeop_p) __P((void *));
#ifdef FIFO
extern int (**fifo_nfsv2nodeop_p) __P((void *));
#endif /* FIFO */
/* vnode is NOT VOP_LOCKed: some vnode types _never_ lock */
if (vp->v_op == nfsv2_vnodeop_p ||
vp->v_op == spec_nfsv2nodeop_p) {
is_ok_anyway = TRUE;
}
#ifdef FIFO
if (vp->v_op == fifo_nfsv2nodeop_p) {
is_ok_anyway = TRUE;
}
#endif /* FIFO */
#endif /* NFS */
if (!is_ok_anyway)
panic("uvm_vnp_uncache: vnode not locked!");

7
sys/vm/vnode_pager.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vnode_pager.c,v 1.36 1998/06/22 22:01:12 sommerfe Exp $ */
/* $NetBSD: vnode_pager.c,v 1.37 1998/06/24 20:58:49 sommerfe Exp $ */
/*
* Copyright (c) 1990 University of Utah.
@ -49,7 +49,6 @@
*/
#include "fs_nfs.h"
#include "opt_fifo.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -563,15 +562,11 @@ vnode_pager_uncache(vp)
#ifdef NFS
extern int (**nfsv2_vnodeop_p) __P((void *));
extern int (**spec_nfsv2nodeop_p) __P((void *));
#ifdef FIFO
extern int (**fifo_nfsv2nodeop_p) __P((void *));
#endif
if (vp->v_op != nfsv2_vnodeop_p
&& vp->v_op != spec_nfsv2nodeop_p
#ifdef FIFO
&& vp->v_op != fifo_nfsv2nodeop_p
#endif
)
#endif