diff options
| author | jeff <jeff@FreeBSD.org> | 2002-03-20 04:09:59 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2002-03-20 04:09:59 +0000 |
| commit | 318cbeeecf54d416eb936f4bb65c00b18aab686b (patch) | |
| tree | daba3c4ee1ae7fcfe85223bbb04c0bc9cea8fba2 /sys/kern/uipc_socket.c | |
| parent | 24fdcd89ad7474e39c39b6ae22c234c6b0d5b40c (diff) | |
| download | FreeBSD-src-318cbeeecf54d416eb936f4bb65c00b18aab686b.zip FreeBSD-src-318cbeeecf54d416eb936f4bb65c00b18aab686b.tar.gz | |
Remove references to vm_zone.h and switch over to the new uma API.
Also, remove maxsockets. If you look carefully you'll notice that the old
zone allocator never honored this anyway.
Diffstat (limited to 'sys/kern/uipc_socket.c')
| -rw-r--r-- | sys/kern/uipc_socket.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 31bb9c0..f578dcd 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -59,7 +59,7 @@ #include <sys/uio.h> #include <sys/jail.h> -#include <vm/vm_zone.h> +#include <vm/uma.h> #include <machine/limits.h> @@ -80,7 +80,7 @@ static struct filterops soread_filtops = static struct filterops sowrite_filtops = { 1, NULL, filt_sowdetach, filt_sowrite }; -vm_zone_t socket_zone; +uma_zone_t socket_zone; so_gen_t so_gencnt; /* generation count for sockets */ MALLOC_DEFINE(M_SONAME, "soname", "socket name"); @@ -119,7 +119,7 @@ soalloc(waitok) { struct socket *so; - so = zalloc(socket_zone); + so = uma_zalloc(socket_zone, waitok); if (so) { /* XXX race condition for reentrant kernel */ bzero(so, sizeof *so); @@ -225,7 +225,7 @@ sodealloc(struct socket *so) #endif crfree(so->so_cred); /* sx_destroy(&so->so_sxlock); */ - zfree(so->so_zone, so); + uma_zfree(so->so_zone, so); --numopensockets; } |
