X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/8429d0227448605965610a9e25ac573e07e17507..dd66b1054b203f438df25e687eb86b16eb3fffe6:/usr/src/sys/miscfs/fifofs/fifo_vnops.c

diff --git a/usr/src/sys/miscfs/fifofs/fifo_vnops.c b/usr/src/sys/miscfs/fifofs/fifo_vnops.c
index e53ae897b1..ea8f8854ba 100644
--- a/usr/src/sys/miscfs/fifofs/fifo_vnops.c
+++ b/usr/src/sys/miscfs/fifofs/fifo_vnops.c
@@ -1,24 +1,26 @@
 /*
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * %sccs.include.redist.c%
  *
- *	@(#)fifo_vnops.c	7.6 (Berkeley) %G%
+ *	@(#)fifo_vnops.c	8.5 (Berkeley) %G%
  */
 
-#include "param.h"
-#include "time.h"
-#include "namei.h"
-#include "vnode.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "stat.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "file.h"
-#include "errno.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/time.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/stat.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/file.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <miscfs/fifofs/fifo.h>
 
 /*
  * This structure is associated with the FIFO vnode and stores
@@ -31,69 +33,68 @@ struct fifoinfo {
 	long		fi_writers;
 };
 
-int	fifo_lookup(),
-	fifo_open(),
-	fifo_read(),
-	fifo_write(),
-	fifo_strategy(),
-	fifo_bmap(),
-	fifo_ioctl(),
-	fifo_select(),
-	fifo_lock(),
-	fifo_unlock(),
-	fifo_close(),
-	fifo_print(),
-	fifo_advlock(),
-	fifo_ebadf(),
-	fifo_badop(),
-	nullop();
-
-struct vnodeops fifo_vnodeops = {
-	fifo_lookup,		/* lookup */
-	fifo_badop,		/* create */
-	fifo_badop,		/* mknod */
-	fifo_open,		/* open */
-	fifo_close,		/* close */
-	fifo_ebadf,		/* access */
-	fifo_ebadf,		/* getattr */
-	fifo_ebadf,		/* setattr */
-	fifo_read,		/* read */
-	fifo_write,		/* write */
-	fifo_ioctl,		/* ioctl */
-	fifo_select,		/* select */
-	fifo_badop,		/* mmap */
-	nullop,			/* fsync */
-	fifo_badop,		/* seek */
-	fifo_badop,		/* remove */
-	fifo_badop,		/* link */
-	fifo_badop,		/* rename */
-	fifo_badop,		/* mkdir */
-	fifo_badop,		/* rmdir */
-	fifo_badop,		/* symlink */
-	fifo_badop,		/* readdir */
-	fifo_badop,		/* readlink */
-	fifo_badop,		/* abortop */
-	nullop,			/* inactive */
-	nullop,			/* reclaim */
-	fifo_lock,		/* lock */
-	fifo_unlock,		/* unlock */
-	fifo_bmap,		/* bmap */
-	fifo_badop,		/* strategy */
-	fifo_print,		/* print */
-	nullop,			/* islocked */
-	fifo_advlock,		/* advlock */
+int (**fifo_vnodeop_p)();
+struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
+	{ &vop_default_desc, vn_default_error },
+	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
+	{ &vop_create_desc, fifo_create },		/* create */
+	{ &vop_mknod_desc, fifo_mknod },		/* mknod */
+	{ &vop_open_desc, fifo_open },			/* open */
+	{ &vop_close_desc, fifo_close },		/* close */
+	{ &vop_access_desc, fifo_access },		/* access */
+	{ &vop_getattr_desc, fifo_getattr },		/* getattr */
+	{ &vop_setattr_desc, fifo_setattr },		/* setattr */
+	{ &vop_read_desc, fifo_read },			/* read */
+	{ &vop_write_desc, fifo_write },		/* write */
+	{ &vop_lease_desc, fifo_lease_check },		/* lease */
+	{ &vop_ioctl_desc, fifo_ioctl },		/* ioctl */
+	{ &vop_select_desc, fifo_select },		/* select */
+	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
+	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
+	{ &vop_seek_desc, fifo_seek },			/* seek */
+	{ &vop_remove_desc, fifo_remove },		/* remove */
+	{ &vop_link_desc, fifo_link },			/* link */
+	{ &vop_rename_desc, fifo_rename },		/* rename */
+	{ &vop_mkdir_desc, fifo_mkdir },		/* mkdir */
+	{ &vop_rmdir_desc, fifo_rmdir },		/* rmdir */
+	{ &vop_symlink_desc, fifo_symlink },		/* symlink */
+	{ &vop_readdir_desc, fifo_readdir },		/* readdir */
+	{ &vop_readlink_desc, fifo_readlink },		/* readlink */
+	{ &vop_abortop_desc, fifo_abortop },		/* abortop */
+	{ &vop_inactive_desc, fifo_inactive },		/* inactive */
+	{ &vop_reclaim_desc, fifo_reclaim },		/* reclaim */
+	{ &vop_lock_desc, fifo_lock },			/* lock */
+	{ &vop_unlock_desc, fifo_unlock },		/* unlock */
+	{ &vop_bmap_desc, fifo_bmap },			/* bmap */
+	{ &vop_strategy_desc, fifo_strategy },		/* strategy */
+	{ &vop_print_desc, fifo_print },		/* print */
+	{ &vop_islocked_desc, fifo_islocked },		/* islocked */
+	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
+	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
+	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
+	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
+	{ &vop_vfree_desc, fifo_vfree },		/* vfree */
+	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
+	{ &vop_update_desc, fifo_update },		/* update */
+	{ &vop_bwrite_desc, fifo_bwrite },		/* bwrite */
+	{ (struct vnodeop_desc*)NULL, (int(*)())NULL }
 };
+struct vnodeopv_desc fifo_vnodeop_opv_desc =
+	{ &fifo_vnodeop_p, fifo_vnodeop_entries };
 
 /*
  * Trivial lookup routine that always fails.
  */
-fifo_lookup(vp, ndp)
-	struct vnode *vp;
-	struct nameidata *ndp;
+/* ARGSUSED */
+fifo_lookup(ap)
+	struct vop_lookup_args /* {
+		struct vnode * a_dvp;
+		struct vnode ** a_vpp;
+		struct componentname * a_cnp;
+	} */ *ap;
 {
-
-	ndp->ni_dvp = vp;
-	ndp->ni_vp = NULL;
+	
+	*ap->a_vpp = NULL;
 	return (ENOTDIR);
 }
 
@@ -102,28 +103,32 @@ fifo_lookup(vp, ndp)
  * to find an active instance of a fifo.
  */
 /* ARGSUSED */
-fifo_open(vp, mode, cred)
-	register struct vnode *vp;
-	int mode;
-	struct ucred *cred;
+fifo_open(ap)
+	struct vop_open_args /* {
+		struct vnode *a_vp;
+		int  a_mode;
+		struct ucred *a_cred;
+		struct proc *a_p;
+	} */ *ap;
 {
+	register struct vnode *vp = ap->a_vp;
 	register struct fifoinfo *fip;
 	struct socket *rso, *wso;
 	int error;
 	static char openstr[] = "fifo";
 
-	if ((mode & (FREAD|FWRITE)) == (FREAD|FWRITE))
+	if ((ap->a_mode & (FREAD|FWRITE)) == (FREAD|FWRITE))
 		return (EINVAL);
 	if ((fip = vp->v_fifoinfo) == NULL) {
 		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
 		vp->v_fifoinfo = fip;
-		if (error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0)) {
+		if (error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0)) {
 			free(fip, M_VNODE);
 			vp->v_fifoinfo = NULL;
 			return (error);
 		}
 		fip->fi_readsock = rso;
-		if (error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0)) {
+		if (error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0)) {
 			(void)soclose(rso);
 			free(fip, M_VNODE);
 			vp->v_fifoinfo = NULL;
@@ -137,26 +142,31 @@ fifo_open(vp, mode, cred)
 			vp->v_fifoinfo = NULL;
 			return (error);
 		}
+		fip->fi_readers = fip->fi_writers = 0;
 		wso->so_state |= SS_CANTRCVMORE;
 		rso->so_state |= SS_CANTSENDMORE;
 	}
 	error = 0;
-	if (mode & FREAD) {
+	if (ap->a_mode & FREAD) {
 		fip->fi_readers++;
 		if (fip->fi_readers == 1) {
 			fip->fi_writesock->so_state &= ~SS_CANTSENDMORE;
 			if (fip->fi_writers > 0)
 				wakeup((caddr_t)&fip->fi_writers);
 		}
-		if (mode & O_NONBLOCK)
+		if (ap->a_mode & O_NONBLOCK)
 			return (0);
-		while (fip->fi_writers == 0)
-			if (error = tsleep((caddr_t)&fip->fi_readers, PSOCK,
-			    openstr, 0))
+		while (fip->fi_writers == 0) {
+			VOP_UNLOCK(vp);
+			error = tsleep((caddr_t)&fip->fi_readers,
+			    PCATCH | PSOCK, openstr, 0);
+			VOP_LOCK(vp);
+			if (error)
 				break;
+		}
 	} else {
 		fip->fi_writers++;
-		if (fip->fi_readers == 0 && (mode & O_NONBLOCK)) {
+		if (fip->fi_readers == 0 && (ap->a_mode & O_NONBLOCK)) {
 			error = ENXIO;
 		} else {
 			if (fip->fi_writers == 1) {
@@ -164,14 +174,18 @@ fifo_open(vp, mode, cred)
 				if (fip->fi_readers > 0)
 					wakeup((caddr_t)&fip->fi_readers);
 			}
-			while (fip->fi_readers == 0)
-				if (error = tsleep((caddr_t)&fip->fi_writers,
-				    PSOCK, openstr, 0))
+			while (fip->fi_readers == 0) {
+				VOP_UNLOCK(vp);
+				error = tsleep((caddr_t)&fip->fi_writers,
+				    PCATCH | PSOCK, openstr, 0);
+				VOP_LOCK(vp);
+				if (error)
 					break;
+			}
 		}
 	}
 	if (error)
-		fifo_close(vp, mode, cred);
+		VOP_CLOSE(vp, ap->a_mode, ap->a_cred, ap->a_p);
 	return (error);
 }
 
@@ -179,32 +193,37 @@ fifo_open(vp, mode, cred)
  * Vnode op for read
  */
 /* ARGSUSED */
-fifo_read(vp, uio, ioflag, cred)
-	struct vnode *vp;
-	register struct uio *uio;
-	int ioflag;
-	struct ucred *cred;
+fifo_read(ap)
+	struct vop_read_args /* {
+		struct vnode *a_vp;
+		struct uio *a_uio;
+		int  a_ioflag;
+		struct ucred *a_cred;
+	} */ *ap;
 {
-	register struct socket *rso = vp->v_fifoinfo->fi_readsock;
+	register struct uio *uio = ap->a_uio;
+	register struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock;
 	int error, startresid;
 
+#ifdef DIAGNOSTIC
 	if (uio->uio_rw != UIO_READ)
 		panic("fifo_read mode");
+#endif
 	if (uio->uio_resid == 0)
 		return (0);
-	if (ioflag & IO_NDELAY)
+	if (ap->a_ioflag & IO_NDELAY)
 		rso->so_state |= SS_NBIO;
 	startresid = uio->uio_resid;
-	VOP_UNLOCK(vp);
-	error = soreceive(rso, (struct mbuf **)0, uio, (int *)0,
-		(struct mbuf **)0, (struct mbuf **)0);
-	VOP_LOCK(vp);
+	VOP_UNLOCK(ap->a_vp);
+	error = soreceive(rso, (struct mbuf **)0, uio, (struct mbuf **)0,
+	    (struct mbuf **)0, (int *)0);
+	VOP_LOCK(ap->a_vp);
 	/*
 	 * Clear EOF indication after first such return.
 	 */
 	if (uio->uio_resid == startresid)
 		rso->so_state &= ~SS_CANTRCVMORE;
-	if (ioflag & IO_NDELAY)
+	if (ap->a_ioflag & IO_NDELAY)
 		rso->so_state &= ~SS_NBIO;
 	return (error);
 }
@@ -213,23 +232,27 @@ fifo_read(vp, uio, ioflag, cred)
  * Vnode op for write
  */
 /* ARGSUSED */
-fifo_write(vp, uio, ioflag, cred)
-	struct vnode *vp;
-	register struct uio *uio;
-	int ioflag;
-	struct ucred *cred;
+fifo_write(ap)
+	struct vop_write_args /* {
+		struct vnode *a_vp;
+		struct uio *a_uio;
+		int  a_ioflag;
+		struct ucred *a_cred;
+	} */ *ap;
 {
-	struct socket *wso = vp->v_fifoinfo->fi_writesock;
+	struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock;
 	int error;
 
-	if (uio->uio_rw != UIO_WRITE)
+#ifdef DIAGNOSTIC
+	if (ap->a_uio->uio_rw != UIO_WRITE)
 		panic("fifo_write mode");
-	if (ioflag & IO_NDELAY)
+#endif
+	if (ap->a_ioflag & IO_NDELAY)
 		wso->so_state |= SS_NBIO;
-	VOP_UNLOCK(vp);
-	error = sosend(wso, (struct mbuf *)0, uio, 0, (struct mbuf *)0);
-	VOP_LOCK(vp);
-	if (ioflag & IO_NDELAY)
+	VOP_UNLOCK(ap->a_vp);
+	error = sosend(wso, (struct mbuf *)0, ap->a_uio, 0, (struct mbuf *)0, 0);
+	VOP_LOCK(ap->a_vp);
+	if (ap->a_ioflag & IO_NDELAY)
 		wso->so_state &= ~SS_NBIO;
 	return (error);
 }
@@ -238,55 +261,64 @@ fifo_write(vp, uio, ioflag, cred)
  * Device ioctl operation.
  */
 /* ARGSUSED */
-fifo_ioctl(vp, com, data, fflag, cred)
-	struct vnode *vp;
-	int com;
-	caddr_t data;
-	int fflag;
-	struct ucred *cred;
+fifo_ioctl(ap)
+	struct vop_ioctl_args /* {
+		struct vnode *a_vp;
+		int  a_command;
+		caddr_t  a_data;
+		int  a_fflag;
+		struct ucred *a_cred;
+		struct proc *a_p;
+	} */ *ap;
 {
 	struct file filetmp;
-	int error;
 
-	if (com == FIONBIO)
+	if (ap->a_command == FIONBIO)
 		return (0);
-	if (fflag & FREAD)
-		filetmp.f_data = (caddr_t)vp->v_fifoinfo->fi_readsock;
+	if (ap->a_fflag & FREAD)
+		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
 	else
-		filetmp.f_data = (caddr_t)vp->v_fifoinfo->fi_writesock;
-	return (soo_ioctl(&filetmp, com, data));
+		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
+	return (soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p));
 }
 
 /* ARGSUSED */
-fifo_select(vp, which, fflag, cred)
-	struct vnode *vp;
-	int which, fflag;
-	struct ucred *cred;
+fifo_select(ap)
+	struct vop_select_args /* {
+		struct vnode *a_vp;
+		int  a_which;
+		int  a_fflags;
+		struct ucred *a_cred;
+		struct proc *a_p;
+	} */ *ap;
 {
 	struct file filetmp;
-	int error;
 
-	if (fflag & FREAD)
-		filetmp.f_data = (caddr_t)vp->v_fifoinfo->fi_readsock;
+	if (ap->a_fflags & FREAD)
+		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
 	else
-		filetmp.f_data = (caddr_t)vp->v_fifoinfo->fi_writesock;
-	return (soo_select(&filetmp, which));
+		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
+	return (soo_select(&filetmp, ap->a_which, ap->a_p));
 }
 
 /*
  * This is a noop, simply returning what one has been given.
  */
-fifo_bmap(vp, bn, vpp, bnp)
-	struct vnode *vp;
-	daddr_t bn;
-	struct vnode **vpp;
-	daddr_t *bnp;
+fifo_bmap(ap)
+	struct vop_bmap_args /* {
+		struct vnode *a_vp;
+		daddr_t  a_bn;
+		struct vnode **a_vpp;
+		daddr_t *a_bnp;
+	} */ *ap;
 {
 
-	if (vpp != NULL)
-		*vpp = vp;
-	if (bnp != NULL)
-		*bnp = bn;
+	if (ap->a_vpp != NULL)
+		*ap->a_vpp = ap->a_vp;
+	if (ap->a_bnp != NULL)
+		*ap->a_bnp = ap->a_bn;
+	if (ap->a_runp != NULL)
+		*ap->a_runp = 0;
 	return (0);
 }
 
@@ -294,16 +326,20 @@ fifo_bmap(vp, bn, vpp, bnp)
  * At the moment we do not do any locking.
  */
 /* ARGSUSED */
-fifo_lock(vp)
-	struct vnode *vp;
+fifo_lock(ap)
+	struct vop_lock_args /* {
+		struct vnode *a_vp;
+	} */ *ap;
 {
 
 	return (0);
 }
 
 /* ARGSUSED */
-fifo_unlock(vp)
-	struct vnode *vp;
+fifo_unlock(ap)
+	struct vop_unlock_args /* {
+		struct vnode *a_vp;
+	} */ *ap;
 {
 
 	return (0);
@@ -313,15 +349,19 @@ fifo_unlock(vp)
  * Device close routine
  */
 /* ARGSUSED */
-fifo_close(vp, fflag, cred)
-	register struct vnode *vp;
-	int fflag;
-	struct ucred *cred;
+fifo_close(ap)
+	struct vop_close_args /* {
+		struct vnode *a_vp;
+		int  a_fflag;
+		struct ucred *a_cred;
+		struct proc *a_p;
+	} */ *ap;
 {
+	register struct vnode *vp = ap->a_vp;
 	register struct fifoinfo *fip = vp->v_fifoinfo;
 	int error1, error2;
 
-	if (fflag & FWRITE) {
+	if (ap->a_fflag & FWRITE) {
 		fip->fi_writers--;
 		if (fip->fi_writers == 0)
 			socantrcvmore(fip->fi_readsock);
@@ -344,12 +384,14 @@ fifo_close(vp, fflag, cred)
 /*
  * Print out the contents of a fifo vnode.
  */
-fifo_print(vp)
-	struct vnode *vp;
+fifo_print(ap)
+	struct vop_print_args /* {
+		struct vnode *a_vp;
+	} */ *ap;
 {
 
 	printf("tag VT_NON");
-	fifo_printinfo(vp);
+	fifo_printinfo(ap->a_vp);
 	printf("\n");
 }
 
@@ -365,6 +407,33 @@ fifo_printinfo(vp)
 		fip->fi_readers, fip->fi_writers);
 }
 
+/*
+ * Return POSIX pathconf information applicable to fifo's.
+ */
+fifo_pathconf(ap)
+	struct vop_pathconf_args /* {
+		struct vnode *a_vp;
+		int a_name;
+		int *a_retval;
+	} */ *ap;
+{
+
+	switch (ap->a_name) {
+	case _PC_LINK_MAX:
+		*ap->a_retval = LINK_MAX;
+		return (0);
+	case _PC_PIPE_BUF:
+		*ap->a_retval = PIPE_BUF;
+		return (0);
+	case _PC_CHOWN_RESTRICTED:
+		*ap->a_retval = 1;
+		return (0);
+	default:
+		return (EINVAL);
+	}
+	/* NOTREACHED */
+}
+
 /*
  * Fifo failed operation
  */
@@ -377,12 +446,15 @@ fifo_ebadf()
 /*
  * Fifo advisory byte-level locks.
  */
-fifo_advlock(vp, id, op, fl, flags)
-	struct vnode *vp;
-	caddr_t id;
-	int op;
-	struct flock *fl;
-	int flags;
+/* ARGSUSED */
+fifo_advlock(ap)
+	struct vop_advlock_args /* {
+		struct vnode *a_vp;
+		caddr_t  a_id;
+		int  a_op;
+		struct flock *a_fl;
+		int  a_flags;
+	} */ *ap;
 {
 
 	return (EOPNOTSUPP);