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

Make sure that the zone destructor doesn't get called twice in

Browse Source 
certain free paths.
This commit is contained in:
bmilekic 2003-06-25 17:25:45 +00:00
parent 4321847dfe
commit 2763308887
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/vm/uma_core.c
View File

@ -1671,8 +1671,10 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
uma_bucket_t bucket;
int bflags;
int cpu;
int skip;
/* This is the fast path free */
skip = 0;
#ifdef UMA_DEBUG_ALLOC_1
printf("Freeing item %p to %s(%p)\n", item, zone->uz_name, zone);
#endif
@ -1684,8 +1686,10 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
if (zone->uz_flags & UMA_ZFLAG_FULL)
goto zfree_internal;
if (zone->uz_dtor)
if (zone->uz_dtor) {
zone->uz_dtor(item, zone->uz_size, udata);
skip = 1;
}
zfree_restart:
cpu = PCPU_GET(cpuid);
@ -1800,7 +1804,7 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
zfree_internal:
uma_zfree_internal(zone, item, udata, 0);
uma_zfree_internal(zone, item, udata, skip);
return;