Skip to content

Commit

Permalink
[PATCH] slab: extract __kmem_cache_destroy from kmem_cache_destroy
Browse files Browse the repository at this point in the history
The ability to free memory allocated to a slab cache is also useful if an
error occurs during setup of a slab.  So extract the function.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Sep 26, 2006
1 parent dbe5e69 commit 117f6eb
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -1833,6 +1833,27 @@ static void set_up_list3s(struct kmem_cache *cachep, int index)
}
}

static void __kmem_cache_destroy(struct kmem_cache *cachep)
{
int i;
struct kmem_list3 *l3;

for_each_online_cpu(i)
kfree(cachep->array[i]);

/* NUMA: free the list3 structures */
for_each_online_node(i) {
l3 = cachep->nodelists[i];
if (l3) {
kfree(l3->shared);
free_alien_cache(l3->alien);
kfree(l3);
}
}
kmem_cache_free(&cache_cache, cachep);
}


/**
* calculate_slab_order - calculate size (page order) of slabs
* @cachep: pointer to the cache that is being created
Expand Down Expand Up @@ -2404,9 +2425,6 @@ EXPORT_SYMBOL(kmem_cache_shrink);
*/
int kmem_cache_destroy(struct kmem_cache *cachep)
{
int i;
struct kmem_list3 *l3;

BUG_ON(!cachep || in_interrupt());

/* Don't let CPUs to come and go */
Expand All @@ -2432,19 +2450,7 @@ int kmem_cache_destroy(struct kmem_cache *cachep)
if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU))
synchronize_rcu();

for_each_online_cpu(i)
kfree(cachep->array[i]);

/* NUMA: free the list3 structures */
for_each_online_node(i) {
l3 = cachep->nodelists[i];
if (l3) {
kfree(l3->shared);
free_alien_cache(l3->alien);
kfree(l3);
}
}
kmem_cache_free(&cache_cache, cachep);
__kmem_cache_destroy(cachep);
unlock_cpu_hotplug();
return 0;
}
Expand Down

0 comments on commit 117f6eb

Please sign in to comment.