2c2
< * Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
---
> * Copyright (c) 2002-2005, 2009 Jeffrey Roberson <jeff@FreeBSD.org>
27c27
< * $FreeBSD: head/sys/vm/uma_int.h 169431 2007-05-09 22:53:34Z rwatson $
---
> * $FreeBSD: head/sys/vm/uma_int.h 187681 2009-01-25 09:11:24Z jeff $
195a196
> char *uk_name; /* Name of creating zone. */
222a224
> typedef struct uma_keg * uma_keg_t;
224,226d225
< /* Simpler reference to uma_keg for internal use. */
< typedef struct uma_keg * uma_keg_t;
<
273a273
> typedef uma_slab_t (*uma_slaballoc)(uma_zone_t, uma_keg_t, int);
274a275
>
284a286,291
> struct uma_klink {
> LIST_ENTRY(uma_klink) kl_link;
> uma_keg_t kl_keg;
> };
> typedef struct uma_klink *uma_klink_t;
>
294d300
< uma_keg_t uz_keg; /* Our underlying Keg */
299a306,309
> LIST_HEAD(,uma_klink) uz_kegs; /* List of kegs. */
> struct uma_klink uz_klink; /* klink for first keg. */
>
> uma_slaballoc uz_slab; /* Allocate a slab from the backend. */
307a318,319
> u_int32_t uz_flags; /* Flags inherited from kegs */
> u_int32_t uz_size; /* Size inherited from kegs */
320a333,335
> #define UMA_ZFLAG_BUCKET 0x02000000 /* Bucket zone. */
> #define UMA_ZFLAG_MULTI 0x04000000 /* Multiple kegs in the zone. */
> #define UMA_ZFLAG_DRAINING 0x08000000 /* Running zone_drain. */
325a341,343
> #define UMA_ZFLAG_INHERIT (UMA_ZFLAG_INTERNAL | UMA_ZFLAG_CACHEONLY | \
> UMA_ZFLAG_BUCKET)
>
334c352
< #define ZONE_LOCK_INIT(z, lc) \
---
> #define KEG_LOCK_INIT(k, lc) \
337,338c355,356
< mtx_init((z)->uz_lock, (z)->uz_name, \
< (z)->uz_name, MTX_DEF | MTX_DUPOK); \
---
> mtx_init(&(k)->uk_lock, (k)->uk_name, \
> (k)->uk_name, MTX_DEF | MTX_DUPOK); \
340c358
< mtx_init((z)->uz_lock, (z)->uz_name, \
---
> mtx_init(&(k)->uk_lock, (k)->uk_name, \
344c362,364
< #define ZONE_LOCK_FINI(z) mtx_destroy((z)->uz_lock)
---
> #define KEG_LOCK_FINI(k) mtx_destroy(&(k)->uk_lock)
> #define KEG_LOCK(k) mtx_lock(&(k)->uk_lock)
> #define KEG_UNLOCK(k) mtx_unlock(&(k)->uk_lock)