remove p arg from fdplock

7 files changed, 22 insertions, 22 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 58887c072d3..c167becec69 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.68 2004/01/12 18:06:51 tedu Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.69 2004/07/22 06:13:08 tedu Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -223,7 +223,7 @@ restart:
 	if ((fp = fd_getfile(fdp, old)) == NULL)
 		return (EBADF);
 	FREF(fp);
-	fdplock(fdp, p);
+	fdplock(fdp);
 	if ((error = fdalloc(p, 0, &new)) != 0) {
 		FRELE(fp);
 		if (error == ENOSPC) {
@@ -275,7 +275,7 @@ restart:
 		return (0);
 	}
 	FREF(fp);
-	fdplock(fdp, p);
+	fdplock(fdp);
 	if (new >= fdp->fd_nfiles) {
 		if ((error = fdalloc(p, new, &i)) != 0) {
 			FRELE(fp);
@@ -333,7 +333,7 @@ restart:
 			error = EINVAL;
 			break;
 		}
-		fdplock(fdp, p);
+		fdplock(fdp);
 		if ((error = fdalloc(p, newmin, &i)) != 0) {
 			if (error == ENOSPC) {
 				fdexpand(p);
@@ -601,7 +601,7 @@ sys_close(p, v, retval)
 
 	if (fd_getfile(fdp, fd) == NULL)
 		return (EBADF);
-	fdplock(fdp, p);
+	fdplock(fdp);
 	error = fdrelease(p, fd);
 	fdpunlock(fdp);
 
@@ -1304,7 +1304,7 @@ sys_closefrom(struct proc *p, void *v, register_t *retval)
 	u_int startfd, i;
 
 	startfd = SCARG(uap, fd);
-	fdplock(fdp, p);
+	fdplock(fdp);
 
 	if (startfd > fdp->fd_lastfile) {
 		fdpunlock(fdp);
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 2fd73bea680..b3401ebbf78 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.48 2004/07/21 17:05:40 art Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.49 2004/07/22 06:13:08 tedu Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -111,7 +111,7 @@ sys_opipe(p, v, retval)
 	struct pipe *rpipe, *wpipe;
 	int fd, error;
 
-	fdplock(fdp, p);
+	fdplock(fdp);
 
 	rpipe = pool_get(&pipe_pool, PR_WAITOK);
 	error = pipe_create(rpipe);
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 4cd585841c4..08860465cc9 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_pty.c,v 1.24 2004/07/21 12:10:20 art Exp $	*/
+/*	$OpenBSD: tty_pty.c,v 1.25 2004/07/22 06:13:08 tedu Exp $	*/
 /*	$NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $	*/
 
 /*
@@ -1133,7 +1133,7 @@ ptmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 	error = 0;
 	switch (cmd) {
 	case PTMGET:
-		fdplock(fdp, p);
+		fdplock(fdp);
 		/* Grab two filedescriptors. */
 		if ((error = falloc(p, &cfp, &cindx)) != 0) {
 			fdpunlock(fdp);
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 9639c3b7e5c..41430a82df5 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.59 2004/04/12 23:58:10 tedu Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.60 2004/07/22 06:13:08 tedu Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -75,7 +75,7 @@ sys_socket(p, v, retval)
 	struct file *fp;
 	int fd, error;
 
-	fdplock(fdp, p);
+	fdplock(fdp);
 
 	if ((error = falloc(p, &fp, &fd)) != 0)
 		goto out;
@@ -210,7 +210,7 @@ sys_accept(p, v, retval)
 	/* Take note if socket was non-blocking. */
 	nflag = (fp->f_flag & FNONBLOCK);
 
-	fdplock(p->p_fd, p);
+	fdplock(p->p_fd);
 	if ((error = falloc(p, &fp, &tmpfd)) != 0) {
 		/*
 		 * Probably ran out of file descriptors. Put the
@@ -344,7 +344,7 @@ sys_socketpair(p, v, retval)
 	if (error)
 		goto free1;
 
-	fdplock(fdp, p);
+	fdplock(fdp);
 	if ((error = falloc(p, &fp1, &fd)) != 0)
 		goto free2;
 	sv[0] = fd;
@@ -941,7 +941,7 @@ sys_pipe(struct proc *p, void *v, register_t *retval)
 	error = copyout((caddr_t)fds, (caddr_t)SCARG(uap, fdp),
 	    2 * sizeof (int));
 	if (error) {
-		fdplock(p->p_fd, p);
+		fdplock(p->p_fd);
 		fdrelease(p, fds[0]);
 		fdrelease(p, fds[1]);
 		fdpunlock(p->p_fd);
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 3a020826946..e0296512069 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_usrreq.c,v 1.27 2004/06/24 19:35:24 tholo Exp $	*/
+/*	$OpenBSD: uipc_usrreq.c,v 1.28 2004/07/22 06:13:08 tedu Exp $	*/
 /*	$NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $	*/
 
 /*
@@ -654,7 +654,7 @@ unp_externalize(rights)
 #endif
 
 restart:
-	fdplock(p->p_fd, p);
+	fdplock(p->p_fd);
 	if (error != 0) {
 		rp = ((struct file **)CMSG_DATA(cm));
 		for (i = 0; i < nfds; i++) {
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index a753fee661e..779a707c27d 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.115 2004/07/18 12:05:07 avsm Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.116 2004/07/22 06:13:08 tedu Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -899,7 +899,7 @@ sys_open(p, v, retval)
 	struct flock lf;
 	struct nameidata nd;
 
-	fdplock(fdp, p);
+	fdplock(fdp);
 
 	if ((error = falloc(p, &fp, &indx)) != 0)
 		goto out;
@@ -1063,7 +1063,7 @@ sys_fhopen(p, v, retval)
 	if ((flags & O_CREAT))
 		return (EINVAL);
 
-	fdplock(fdp, p);
+	fdplock(fdp);
 	if ((error = falloc(p, &fp, &indx)) != 0) {
 		fp = NULL;
 		goto bad;
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index a9e1afdb832..238a9d90cca 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portal_vnops.c,v 1.21 2004/06/24 19:35:25 tholo Exp $	*/
+/*	$OpenBSD: portal_vnops.c,v 1.22 2004/07/22 06:12:43 tedu Exp $	*/
 /*	$NetBSD: portal_vnops.c,v 1.17 1996/02/13 13:12:57 mycroft Exp $	*/
 
 /*
@@ -412,7 +412,7 @@ portal_open(v)
 		fdpunlock(p->p_fd);
 		error = soreceive(so, (struct mbuf **) 0, &auio,
 					&m, &cm, &flags);
-		fdplock(p->p_fd, p);
+		fdplock(p->p_fd);
 		if (error)
 			goto bad;