52c52
< __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 147996 2005-07-14 16:35:13Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 148070 2005-07-15 23:34:39Z rwatson $");
194a195,197
> /*
> * Flags and enumerations to be passed to internal functions.
> */
196a200,201
> #define ZFREE_STATFAIL 0x00000001 /* Update zone failure statistic. */
>
222c227,228
< static void uma_zfree_internal(uma_zone_t, void *, void *, enum zfreeskip);
---
> static void uma_zfree_internal(uma_zone_t, void *, void *, enum zfreeskip,
> int);
347c353
< uma_zfree_internal(ubz->ubz_zone, bucket, NULL, SKIP_NONE);
---
> uma_zfree_internal(ubz->ubz_zone, bucket, NULL, SKIP_NONE, 0);
538c544
< hash->uh_slab_hash, NULL, SKIP_NONE);
---
> hash->uh_slab_hash, NULL, SKIP_NONE, 0);
587c593
< uma_zfree_internal(zone, item, slab, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, slab, SKIP_DTOR, 0);
754c760
< SKIP_NONE);
---
> SKIP_NONE, 0);
817c823
< SKIP_NONE);
---
> SKIP_NONE, 0);
874c880
< NULL, SKIP_NONE);
---
> NULL, SKIP_NONE, 0);
1337a1344
> zone->uz_fails = 0;
1464c1471
< uma_zfree_internal(kegs, keg, NULL, SKIP_NONE);
---
> uma_zfree_internal(kegs, keg, NULL, SKIP_NONE, 0);
1768c1775
< uma_zfree_internal(zones, zone, NULL, SKIP_NONE);
---
> uma_zfree_internal(zones, zone, NULL, SKIP_NONE, 0);
1852c1859
< SKIP_DTOR);
---
> SKIP_DTOR, ZFREE_STATFAIL);
2159c2166
< NULL, SKIP_FINI);
---
> NULL, SKIP_FINI, 0);
2211a2219
> zone->uz_fails++;
2230c2238,2239
< uma_zfree_internal(zone, item, udata, SKIP_FINI);
---
> uma_zfree_internal(zone, item, udata, SKIP_FINI,
> ZFREE_STATFAIL);
2236c2245,2246
< uma_zfree_internal(zone, item, udata, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, udata, SKIP_DTOR,
> ZFREE_STATFAIL);
2409c2419
< uma_zfree_internal(zone, item, udata, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, udata, SKIP_DTOR, ZFREE_STATFAIL);
2425c2435
< enum zfreeskip skip)
---
> enum zfreeskip skip, int flags)
2441a2452,2454
> if (flags & ZFREE_STATFAIL)
> zone->uz_fails++;
>
2693c2706,2707
< uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE);
---
> uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE,
> ZFREE_STATFAIL);
2704c2718
< uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE);
---
> uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE, 0);
2973a2988
> uth.uth_fails = z->uz_fails;
< __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 147996 2005-07-14 16:35:13Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/vm/uma_core.c 148070 2005-07-15 23:34:39Z rwatson $");
194a195,197
> /*
> * Flags and enumerations to be passed to internal functions.
> */
196a200,201
> #define ZFREE_STATFAIL 0x00000001 /* Update zone failure statistic. */
>
222c227,228
< static void uma_zfree_internal(uma_zone_t, void *, void *, enum zfreeskip);
---
> static void uma_zfree_internal(uma_zone_t, void *, void *, enum zfreeskip,
> int);
347c353
< uma_zfree_internal(ubz->ubz_zone, bucket, NULL, SKIP_NONE);
---
> uma_zfree_internal(ubz->ubz_zone, bucket, NULL, SKIP_NONE, 0);
538c544
< hash->uh_slab_hash, NULL, SKIP_NONE);
---
> hash->uh_slab_hash, NULL, SKIP_NONE, 0);
587c593
< uma_zfree_internal(zone, item, slab, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, slab, SKIP_DTOR, 0);
754c760
< SKIP_NONE);
---
> SKIP_NONE, 0);
817c823
< SKIP_NONE);
---
> SKIP_NONE, 0);
874c880
< NULL, SKIP_NONE);
---
> NULL, SKIP_NONE, 0);
1337a1344
> zone->uz_fails = 0;
1464c1471
< uma_zfree_internal(kegs, keg, NULL, SKIP_NONE);
---
> uma_zfree_internal(kegs, keg, NULL, SKIP_NONE, 0);
1768c1775
< uma_zfree_internal(zones, zone, NULL, SKIP_NONE);
---
> uma_zfree_internal(zones, zone, NULL, SKIP_NONE, 0);
1852c1859
< SKIP_DTOR);
---
> SKIP_DTOR, ZFREE_STATFAIL);
2159c2166
< NULL, SKIP_FINI);
---
> NULL, SKIP_FINI, 0);
2211a2219
> zone->uz_fails++;
2230c2238,2239
< uma_zfree_internal(zone, item, udata, SKIP_FINI);
---
> uma_zfree_internal(zone, item, udata, SKIP_FINI,
> ZFREE_STATFAIL);
2236c2245,2246
< uma_zfree_internal(zone, item, udata, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, udata, SKIP_DTOR,
> ZFREE_STATFAIL);
2409c2419
< uma_zfree_internal(zone, item, udata, SKIP_DTOR);
---
> uma_zfree_internal(zone, item, udata, SKIP_DTOR, ZFREE_STATFAIL);
2425c2435
< enum zfreeskip skip)
---
> enum zfreeskip skip, int flags)
2441a2452,2454
> if (flags & ZFREE_STATFAIL)
> zone->uz_fails++;
>
2693c2706,2707
< uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE);
---
> uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE,
> ZFREE_STATFAIL);
2704c2718
< uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE);
---
> uma_zfree_internal(slabzone, slab, NULL, SKIP_NONE, 0);
2973a2988
> uth.uth_fails = z->uz_fails;