diff options
| -rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 2 | ||||
| -rw-r--r-- | sys/fs/portalfs/portal_vnops.c | 2 | ||||
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 5 | ||||
| -rw-r--r-- | sys/sys/un.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index e7112d0..c9d0fa2 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -201,7 +201,7 @@ fifo_open(ap) if (error) goto fail2; fip->fi_writesock = wso; - error = unp_connect2(wso, rso); + error = uipc_connect2(wso, rso); if (error) { (void)soclose(wso); fail2: diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index a8c31c8..b43936d 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -203,7 +203,7 @@ portal_connect(so, so2) M_NOWAIT); so2 = so3; - return (unp_connect2(so, so2)); + return (uipc_connect2(so, so2)); } static int diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 4de0ac4..7ad7929 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -89,6 +89,7 @@ static int unp_attach(struct socket *); static void unp_detach(struct unpcb *); static int unp_bind(struct unpcb *,struct sockaddr *, struct thread *); static int unp_connect(struct socket *,struct sockaddr *, struct thread *); +static int unp_connect2(struct socket *so, struct socket *so2); static void unp_disconnect(struct unpcb *); static void unp_shutdown(struct unpcb *); static void unp_drop(struct unpcb *, int); @@ -167,7 +168,7 @@ uipc_connect(struct socket *so, struct sockaddr *nam, struct thread *td) return (unp_connect(so, nam, curthread)); } -static int +int uipc_connect2(struct socket *so1, struct socket *so2) { struct unpcb *unp = sotounpcb(so1); @@ -765,7 +766,7 @@ bad: return (error); } -int +static int unp_connect2(so, so2) register struct socket *so; register struct socket *so2; diff --git a/sys/sys/un.h b/sys/sys/un.h index 12ca360..854e0d0 100644 --- a/sys/sys/un.h +++ b/sys/sys/un.h @@ -64,10 +64,10 @@ struct mbuf; struct socket; struct sockopt; +int uipc_connect2(struct socket *so1, struct socket *so2); int uipc_ctloutput(struct socket *so, struct sockopt *sopt); int uipc_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, struct mbuf *control); -int unp_connect2(struct socket *so, struct socket *so2); void unp_dispose(struct mbuf *m); int unp_externalize(struct mbuf *mbuf, struct mbuf **controlp); void unp_init(void); |
