summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsu <hsu@FreeBSD.org>2002-04-08 03:04:22 +0000
committerhsu <hsu@FreeBSD.org>2002-04-08 03:04:22 +0000
commitd9992faaf2001cc6dca237e00491cc57a7426909 (patch)
tree2f50d9602f6a425b0371476b26a36ad83990eb2a
parent7ab1f0e075fd4a046eaf9156daf820ea760f6b1c (diff)
downloadFreeBSD-src-d9992faaf2001cc6dca237e00491cc57a7426909.zip
FreeBSD-src-d9992faaf2001cc6dca237e00491cc57a7426909.tar.gz
There's only one socket zone so we don't need to remember it
in every socket structure.
-rw-r--r--sys/kern/uipc_socket.c3
-rw-r--r--sys/sys/socketvar.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 3c1adf8..6c68a79 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -129,7 +129,6 @@ soalloc(waitok)
/* XXX race condition for reentrant kernel */
bzero(so, sizeof *so);
so->so_gencnt = ++so_gencnt;
- so->so_zone = socket_zone;
/* sx_init(&so->so_sxlock, "socket sxlock"); */
TAILQ_INIT(&so->so_aiojobq);
++numopensockets;
@@ -230,7 +229,7 @@ sodealloc(struct socket *so)
#endif
crfree(so->so_cred);
/* sx_destroy(&so->so_sxlock); */
- uma_zfree(so->so_zone, so);
+ uma_zfree(socket_zone, so);
--numopensockets;
}
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index f4e57d6..93ea687 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -52,7 +52,6 @@ typedef u_quad_t so_gen_t;
struct accept_filter;
struct socket {
- uma_zone_t so_zone; /* zone we were allocated from */
int so_count; /* reference count */
short so_type; /* generic type, see socket.h */
short so_options; /* from socket call, see socket.h */
OpenPOWER on IntegriCloud