diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 72f2d90e7ef6..b8ebe71f872d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -3231,8 +3231,8 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups) | |||
3231 | return 0; | 3231 | return 0; |
3232 | } | 3232 | } |
3233 | 3233 | ||
3234 | int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, | 3234 | int memcg_alloc_cache_params(struct mem_cgroup *memcg, struct kmem_cache *s, |
3235 | struct kmem_cache *root_cache) | 3235 | struct kmem_cache *root_cache) |
3236 | { | 3236 | { |
3237 | size_t size; | 3237 | size_t size; |
3238 | 3238 | ||
@@ -3260,6 +3260,11 @@ int memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, | |||
3260 | return 0; | 3260 | return 0; |
3261 | } | 3261 | } |
3262 | 3262 | ||
3263 | void memcg_free_cache_params(struct kmem_cache *s) | ||
3264 | { | ||
3265 | kfree(s->memcg_params); | ||
3266 | } | ||
3267 | |||
3263 | void memcg_release_cache(struct kmem_cache *s) | 3268 | void memcg_release_cache(struct kmem_cache *s) |
3264 | { | 3269 | { |
3265 | struct kmem_cache *root; | 3270 | struct kmem_cache *root; |
@@ -3288,7 +3293,7 @@ void memcg_release_cache(struct kmem_cache *s) | |||
3288 | 3293 | ||
3289 | css_put(&memcg->css); | 3294 | css_put(&memcg->css); |
3290 | out: | 3295 | out: |
3291 | kfree(s->memcg_params); | 3296 | memcg_free_cache_params(s); |
3292 | } | 3297 | } |
3293 | 3298 | ||
3294 | /* | 3299 | /* |