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

Rearrange code in soalloc() so that it's less indented by returning

Browse Source 
early if uma_zalloc() from the socket zone fails.  No functional
change.

MFC after:	1 week
This commit is contained in:
rwatson 2006-06-08 22:33:18 +00:00
parent 6389ae9dfe
commit ae84950041
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/kern/uipc_socket.c
View File

@ -210,21 +210,21 @@ soalloc(int mflags)
struct socket *so;
so = uma_zalloc(socket_zone, mflags | M_ZERO);
if (so != NULL) {
if (so == NULL)
return (NULL);
#ifdef MAC
if (mac_init_socket(so, mflags) != 0) {
uma_zfree(socket_zone, so);
return (NULL);
}
#endif
SOCKBUF_LOCK_INIT(&so->so_snd, "so_snd");
SOCKBUF_LOCK_INIT(&so->so_rcv, "so_rcv");
TAILQ_INIT(&so->so_aiojobq);
mtx_lock(&so_global_mtx);
so->so_gencnt = ++so_gencnt;
++numopensockets;
mtx_unlock(&so_global_mtx);
if (mac_init_socket(so, mflags) != 0) {
uma_zfree(socket_zone, so);
return (NULL);
}
#endif
SOCKBUF_LOCK_INIT(&so->so_snd, "so_snd");
SOCKBUF_LOCK_INIT(&so->so_rcv, "so_rcv");
TAILQ_INIT(&so->so_aiojobq);
mtx_lock(&so_global_mtx);
so->so_gencnt = ++so_gencnt;
++numopensockets;
mtx_unlock(&so_global_mtx);
return (so);
}