diff options
| author | Christoph Lameter <cl@linux.com> | 2012-09-05 01:38:33 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-09-05 11:00:36 +0200 |
| commit | 12c3667fb780e20360ad0bde32dfb3591ef609ad (patch) | |
| tree | dbced65da22c85212bf632ff6953c0a94252c3ef /mm/slub.c | |
| parent | mm/sl[aou]b: Move freeing of kmem_cache structure to common code (diff) | |
| download | linux-12c3667fb780e20360ad0bde32dfb3591ef609ad.tar.xz linux-12c3667fb780e20360ad0bde32dfb3591ef609ad.zip | |
mm/sl[aou]b: Get rid of __kmem_cache_destroy
What is done there can be done in __kmem_cache_shutdown.
This affects RCU handling somewhat. On rcu free all slab allocators do
not refer to other management structures than the kmem_cache structure.
Therefore these other structures can be freed before the rcu deferred
free to the page allocator occurs.
Reviewed-by: Joonsoo Kim <js1304@gmail.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/slub.c b/mm/slub.c index 6f932f7a8219..e5e09873f5ec 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3205,12 +3205,12 @@ static inline int kmem_cache_close(struct kmem_cache *s) int __kmem_cache_shutdown(struct kmem_cache *s) { - return kmem_cache_close(s); -} + int rc = kmem_cache_close(s); -void __kmem_cache_destroy(struct kmem_cache *s) -{ - sysfs_slab_remove(s); + if (!rc) + sysfs_slab_remove(s); + + return rc; } /******************************************************************** |