diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-23 07:36:46 +0100 |
| commit | fb86780bf7708cd6553f592a6318f10eda766127 (patch) | |
| tree | b59737c56a407c9f82166576209ef8e8cd09ecc6 /mm/slab.c | |
| parent | 8f8e2aec9944dd12671182a1a26b8e1a35872a1d (diff) | |
| parent | dd71a17b1193dd4a4c35ecd0ba227aac3d110836 (diff) | |
| download | linux-fb86780bf7708cd6553f592a6318f10eda766127.tar.bz2 | |
Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/slab.c b/mm/slab.c index 6ecc697a8bc4..621fbcb35a36 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2275,7 +2275,7 @@ __kmem_cache_create (struct kmem_cache *cachep, unsigned long flags) err = setup_cpu_cache(cachep, gfp); if (err) { - __kmem_cache_shutdown(cachep); + __kmem_cache_release(cachep); return err; } @@ -2414,12 +2414,13 @@ int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate) int __kmem_cache_shutdown(struct kmem_cache *cachep) { + return __kmem_cache_shrink(cachep, false); +} + +void __kmem_cache_release(struct kmem_cache *cachep) +{ int i; struct kmem_cache_node *n; - int rc = __kmem_cache_shrink(cachep, false); - - if (rc) - return rc; free_percpu(cachep->cpu_cache); @@ -2430,7 +2431,6 @@ int __kmem_cache_shutdown(struct kmem_cache *cachep) kfree(n); cachep->node[i] = NULL; } - return 0; } /* |