Now that portalfs doesn't directly invoke uipc_connect2(), make it a
static symbol. MFC after: 3 days
This commit is contained in:
parent
4759ebf015
commit
2c8995842c
sys
@ -225,6 +225,7 @@ static struct rwlock unp_global_rwlock;
|
|||||||
#define UNP_PCB_UNLOCK(unp) mtx_unlock(&(unp)->unp_mtx)
|
#define UNP_PCB_UNLOCK(unp) mtx_unlock(&(unp)->unp_mtx)
|
||||||
#define UNP_PCB_LOCK_ASSERT(unp) mtx_assert(&(unp)->unp_mtx, MA_OWNED)
|
#define UNP_PCB_LOCK_ASSERT(unp) mtx_assert(&(unp)->unp_mtx, MA_OWNED)
|
||||||
|
|
||||||
|
static int uipc_connect2(struct socket *, struct socket *);
|
||||||
static int uipc_ctloutput(struct socket *, struct sockopt *);
|
static int uipc_ctloutput(struct socket *, struct sockopt *);
|
||||||
static int unp_connect(struct socket *, struct sockaddr *,
|
static int unp_connect(struct socket *, struct sockaddr *,
|
||||||
struct thread *);
|
struct thread *);
|
||||||
@ -531,7 +532,7 @@ uipc_close(struct socket *so)
|
|||||||
/*
|
/*
|
||||||
* uipc_connect2() is not static as it is invoked directly by fifofs.
|
* uipc_connect2() is not static as it is invoked directly by fifofs.
|
||||||
*/
|
*/
|
||||||
int
|
static int
|
||||||
uipc_connect2(struct socket *so1, struct socket *so2)
|
uipc_connect2(struct socket *so1, struct socket *so2)
|
||||||
{
|
{
|
||||||
struct unpcb *unp, *unp2;
|
struct unpcb *unp, *unp2;
|
||||||
|
@ -57,18 +57,13 @@ struct sockaddr_un {
|
|||||||
#define LOCAL_CREDS 0x002 /* pass credentials to receiver */
|
#define LOCAL_CREDS 0x002 /* pass credentials to receiver */
|
||||||
#define LOCAL_CONNWAIT 0x004 /* connects block until accepted */
|
#define LOCAL_CONNWAIT 0x004 /* connects block until accepted */
|
||||||
|
|
||||||
#ifdef _KERNEL
|
#ifndef _KERNEL
|
||||||
|
|
||||||
struct socket;
|
|
||||||
int uipc_connect2(struct socket *so1, struct socket *so2);
|
|
||||||
|
|
||||||
#else /* !_KERNEL */
|
|
||||||
|
|
||||||
/* actual length of an initialized sockaddr_un */
|
/* actual length of an initialized sockaddr_un */
|
||||||
#define SUN_LEN(su) \
|
#define SUN_LEN(su) \
|
||||||
(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
|
(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
|
||||||
|
|
||||||
#endif /* _KERNEL */
|
#endif /* !_KERNEL */
|
||||||
|
|
||||||
#endif /* __BSD_VISIBLE */
|
#endif /* __BSD_VISIBLE */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user