Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/miscfs/fifofs/fifo_vnops.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/miscfs/fifofs/fifo_vnops.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -p -r1.41.2.3 -r1.41.2.4
--- src/sys/miscfs/fifofs/fifo_vnops.c	2004/09/18 14:54:15	1.41.2.3
+++ src/sys/miscfs/fifofs/fifo_vnops.c	2004/09/21 13:36:30	1.41.2.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: fifo_vnops.c,v 1.41.2.3 2004/09/18 14:54:15 skrll Exp $	*/
+/*	$NetBSD: fifo_vnops.c,v 1.41.2.4 2004/09/21 13:36:30 skrll Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993, 1995
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.41.2.3 2004/09/18 14:54:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.41.2.4 2004/09/21 13:36:30 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -147,28 +147,29 @@ fifo_open(void *v)
 		struct vnode	*a_vp;
 		int		a_mode;
 		struct ucred	*a_cred;
-		struct proc	*a_p;
+		struct lwp	*a_l;
 	} */ *ap = v;
 	struct vnode	*vp;
 	struct fifoinfo	*fip;
+	struct lwp	*l = ap->a_l;
 	struct proc	*p;
 	struct socket	*rso, *wso;
 	int		error;
 
 	vp = ap->a_vp;
-	p = ap->a_p;
+	p = ap->a_l->l_proc;
 
 	if ((fip = vp->v_fifoinfo) == NULL) {
 		MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
 		vp->v_fifoinfo = fip;
-		error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, p);
+		error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, l);
 		if (error != 0) {
 			free(fip, M_VNODE);
 			vp->v_fifoinfo = NULL;
 			return (error);
 		}
 		fip->fi_readsock = rso;
-		error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, p);
+		error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, l);
 		if (error != 0) {
 			(void)soclose(rso);
 			free(fip, M_VNODE);
@@ -233,7 +234,7 @@ fifo_open(void *v)
 	}
 	return (0);
  bad:
-	VOP_CLOSE(vp, ap->a_mode, ap->a_cred, p);
+	VOP_CLOSE(vp, ap->a_mode, ap->a_cred, ap->a_l);
 	return (error);
 }
 
@@ -309,7 +310,7 @@ fifo_write(void *v)
 		wso->so_state |= SS_NBIO;
 	VOP_UNLOCK(ap->a_vp, 0);
 	error = (*wso->so_send)(wso, (struct mbuf *)0, ap->a_uio, 0,
-	    (struct mbuf *)0, 0, curproc /*XXX*/);
+	    (struct mbuf *)0, 0, curlwp /*XXX*/);
 	vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY);
 	if (ap->a_ioflag & IO_NDELAY)
 		wso->so_state &= ~SS_NBIO;
@@ -329,7 +330,7 @@ fifo_ioctl(void *v)
 		void		*a_data;
 		int		a_fflag;
 		struct ucred	*a_cred;
-		struct proc	*a_p;
+		struct lwp	*a_l;
 	} */ *ap = v;
 	struct file	filetmp;
 	int		error;
@@ -338,13 +339,13 @@ fifo_ioctl(void *v)
 		return (0);
 	if (ap->a_fflag & FREAD) {
 		filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock;
-		error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p);
+		error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_l);
 		if (error)
 			return (error);
 	}
 	if (ap->a_fflag & FWRITE) {
 		filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock;
-		error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_p);
+		error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_l);
 		if (error)
 			return (error);
 	}
@@ -358,7 +359,7 @@ fifo_poll(void *v)
 	struct vop_poll_args /* {
 		struct vnode	*a_vp;
 		int		a_events;
-		struct proc	*a_p;
+		struct lwp	*a_l;
 	} */ *ap = v;
 	struct file	filetmp;
 	int		revents;
@@ -367,12 +368,12 @@ fifo_poll(void *v)
 	if (ap->a_events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
 		filetmp.f_data = ap->a_vp->v_fifoinfo->fi_readsock;
 		if (filetmp.f_data)
-			revents |= soo_poll(&filetmp, ap->a_events, ap->a_p);
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_l);
 	}
 	if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) {
 		filetmp.f_data = ap->a_vp->v_fifoinfo->fi_writesock;
 		if (filetmp.f_data)
-			revents |= soo_poll(&filetmp, ap->a_events, ap->a_p);
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_l);
 	}
 
 	return (revents);
@@ -383,7 +384,7 @@ fifo_inactive(void *v)
 {
 	struct vop_inactive_args /* {
 		struct vnode	*a_vp;
-		struct proc	*a_p;
+		struct lwp	*a_l;
 	} */ *ap = v;
 
 	VOP_UNLOCK(ap->a_vp, 0);
@@ -424,7 +425,7 @@ fifo_close(void *v)
 		struct vnode	*a_vp;
 		int		a_fflag;
 		struct ucred	*a_cred;
-		struct proc	*a_p;
+		struct lwp	*a_l;
 	} */ *ap = v;
 	struct vnode	*vp;
 	struct fifoinfo	*fip;