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

Rename unp_dispose_so() to unp_dispose().

Browse Source 
It implements the dom_dispose method for local socket domain, so its name
should match the method name.
This commit is contained in:
Mark Johnston 2016-08-31 21:48:22 +00:00
parent 5462b0052b
commit 99ab95db4d
1 changed files with 7 additions and 7 deletions

14
sys/kern/uipc_usrreq.c

@ -277,8 +277,8 @@ static int unp_connectat(int, struct socket *, struct sockaddr *,
struct thread *);
static int unp_connect2(struct socket *so, struct socket *so2, int);
static void unp_disconnect(struct unpcb *unp, struct unpcb *unp2);
static void unp_dispose(struct mbuf *);
static void unp_dispose_so(struct socket *so);
static void unp_dispose(struct socket *so);
static void unp_dispose_mbuf(struct mbuf *);
static void unp_shutdown(struct unpcb *);
static void unp_drop(struct unpcb *);
static void unp_gc(__unused void *, int);
@ -335,7 +335,7 @@ static struct domain localdomain = {
.dom_name = "local",
.dom_init = unp_init,
.dom_externalize = unp_externalize,
.dom_dispose = unp_dispose_so,
.dom_dispose = unp_dispose,
.dom_protosw = localsw,
.dom_protoswNPROTOSW = &localsw[nitems(localsw)]
};
@ -1051,7 +1051,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
UNP_LINK_RUNLOCK();
if (control != NULL && error != 0)
unp_dispose(control);
unp_dispose_mbuf(control);
release:
if (control != NULL)
@ -2352,7 +2352,7 @@ unp_gc(__unused void *arg, int pending)
}
static void
unp_dispose(struct mbuf *m)
unp_dispose_mbuf(struct mbuf *m)
{
if (m)
@ -2363,7 +2363,7 @@ unp_dispose(struct mbuf *m)
* Synchronize against unp_gc, which can trip over data as we are freeing it.
*/
static void
unp_dispose_so(struct socket *so)
unp_dispose(struct socket *so)
{
struct unpcb *unp;
@ -2371,7 +2371,7 @@ unp_dispose_so(struct socket *so)
UNP_LIST_LOCK();
unp->unp_gcflag |= UNPGC_IGNORE_RIGHTS;
UNP_LIST_UNLOCK();
unp_dispose(so->so_rcv.sb_mb);
unp_dispose_mbuf(so->so_rcv.sb_mb);
}
static void