File tree Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Expand file tree Collapse file tree 1 file changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -3704,13 +3704,6 @@ static void memcg_offline_kmem(struct mem_cgroup *memcg)
3704
3704
3705
3705
memcg_free_cache_id (kmemcg_id );
3706
3706
}
3707
-
3708
- static void memcg_free_kmem (struct mem_cgroup * memcg )
3709
- {
3710
- /* css_alloc() failed, offlining didn't happen */
3711
- if (unlikely (memcg -> kmem_state == KMEM_ONLINE ))
3712
- memcg_offline_kmem (memcg );
3713
- }
3714
3707
#else
3715
3708
static int memcg_online_kmem (struct mem_cgroup * memcg )
3716
3709
{
@@ -3719,9 +3712,6 @@ static int memcg_online_kmem(struct mem_cgroup *memcg)
3719
3712
static void memcg_offline_kmem (struct mem_cgroup * memcg )
3720
3713
{
3721
3714
}
3722
- static void memcg_free_kmem (struct mem_cgroup * memcg )
3723
- {
3724
- }
3725
3715
#endif /* CONFIG_MEMCG_KMEM */
3726
3716
3727
3717
static int memcg_update_kmem_max (struct mem_cgroup * memcg ,
@@ -5356,7 +5346,9 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
5356
5346
cancel_work_sync (& memcg -> high_work );
5357
5347
mem_cgroup_remove_from_trees (memcg );
5358
5348
free_shrinker_info (memcg );
5359
- memcg_free_kmem (memcg );
5349
+
5350
+ /* Need to offline kmem if online_css() fails */
5351
+ memcg_offline_kmem (memcg );
5360
5352
mem_cgroup_free (memcg );
5361
5353
}
5362
5354
You can’t perform that action at this time.
0 commit comments