diff options
| author |   guenther <guenther@openbsd.org> | 2012-04-22 05:43:14 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2012-04-22 05:43:14 +0000 |
| commit | 06a89b59aa60d7f9c0e1ea26802b0384ef0dc14c (patch) | |
| tree | 2a68460f65d82ea3089edac4aeb664d53b5154e8 /sys/kern/uipc_socket.c | |
| parent | Fix printing commands with no arguments, from Benjamin Poirier. (diff) | |
| download | wireguard-openbsd-06a89b59aa60d7f9c0e1ea26802b0384ef0dc14c.tar.xz wireguard-openbsd-06a89b59aa60d7f9c0e1ea26802b0384ef0dc14c.zip | |
Add struct proc * argument to FRELE() and FILE_SET_MATURE() in
anticipation of further changes to closef(). No binary change.
ok krw@ miod@ deraadt@
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 6749f4c56c5..255cf6c8680 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.98 2012/03/23 15:51:26 guenther Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.99 2012/04/22 05:43:14 guenther Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -1058,12 +1058,12 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv) /* Lock both receive and send buffer. */ if ((error = sblock(&so->so_rcv, (so->so_state & SS_NBIO) ? M_NOWAIT : M_WAITOK)) != 0) { - FRELE(fp); + FRELE(fp, curproc); return (error); } if ((error = sblock(&sosp->so_snd, M_WAITOK)) != 0) { sbunlock(&so->so_rcv); - FRELE(fp); + FRELE(fp, curproc); return (error); } s = splsoftnet(); @@ -1109,7 +1109,7 @@ sosplice(struct socket *so, int fd, off_t max, struct timeval *tv) splx(s); sbunlock(&sosp->so_snd); sbunlock(&so->so_rcv); - FRELE(fp); + FRELE(fp, curproc); return (error); } |