diff options
author | Richard Braun <rbraun@sceen.net> | 2013-06-09 16:26:32 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2013-06-09 16:26:32 +0200 |
commit | 37e6f8889a3e91f6f1342efd7792e6c105e392ce (patch) | |
tree | 25b57c4ad25bcf2d72af8fd6d3feba419da5edd6 | |
parent | 6ef21bfc089db2fd52583b076c7db7f6dfbd7131 (diff) |
kern/kmem: fix object construction bug
-rw-r--r-- | kern/kmem.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/kern/kmem.c b/kern/kmem.c index 47371a99..bba9372b 100644 --- a/kern/kmem.c +++ b/kern/kmem.c @@ -383,18 +383,24 @@ kmem_cpu_pool_push(struct kmem_cpu_pool *cpu_pool, void *obj) static int kmem_cpu_pool_fill(struct kmem_cpu_pool *cpu_pool, struct kmem_cache *cache) { - void *obj; + kmem_cache_ctor_t ctor; + void *buf; int i; + ctor = (cpu_pool->flags & KMEM_CF_VERIFY) ? NULL : cache->ctor; + mutex_lock(&cache->lock); for (i = 0; i < cpu_pool->transfer_size; i++) { - obj = kmem_cache_alloc_from_slab(cache); + buf = kmem_cache_alloc_from_slab(cache); - if (obj == NULL) + if (buf == NULL) break; - kmem_cpu_pool_push(cpu_pool, obj); + if (ctor != NULL) + ctor(buf); + + kmem_cpu_pool_push(cpu_pool, buf); } mutex_unlock(&cache->lock); |