d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that portalfs doesn't directly invoke uipc_connect2(), make it a

Browse Source 
static symbol.

MFC after:	3 days
This commit is contained in:
Robert Watson 2008-10-06 18:43:11 +00:00
parent 4759ebf015
commit 2c8995842c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/kern/uipc_usrreq.c
View File

@ -225,6 +225,7 @@ static struct rwlock unp_global_rwlock;
#define UNP_PCB_UNLOCK(unp) mtx_unlock(&(unp)->unp_mtx)
#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 unp_connect(struct socket *, struct sockaddr *,
struct thread *);
@ -531,7 +532,7 @@ uipc_close(struct socket *so)
/*
* uipc_connect2() is not static as it is invoked directly by fifofs.
*/
int
static int
uipc_connect2(struct socket *so1, struct socket *so2)
{
struct unpcb *unp, *unp2;

9
sys/sys/un.h
View File

@ -57,18 +57,13 @@ struct sockaddr_un {
#define LOCAL_CREDS 0x002 /* pass credentials to receiver */
#define LOCAL_CONNWAIT 0x004 /* connects block until accepted */
#ifdef _KERNEL
struct socket;
int uipc_connect2(struct socket *so1, struct socket *so2);
#else /* !_KERNEL */
#ifndef _KERNEL
/* actual length of an initialized sockaddr_un */
#define SUN_LEN(su) \
(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
#endif /* _KERNEL */
#endif /* !_KERNEL */
#endif /* __BSD_VISIBLE */