aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2014-01-23 18:53:39 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-23 19:36:53 -0500
commit0d8a4a3799ab007b7a5e50aff9da9558925e0c15 (patch)
treea57c79e7e753dd3a7255a2aeb687af0948dba3b7 /mm
parent6c14466cc00ff13121ae782d33d9df0fde20b124 (diff)
memcg: remove unused code from kmem_cache_destroy_work_func
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Reviewed-by: Michal Hocko <mhocko@suse.cz> Cc: Johannes Weiner <hannes@cmpxchg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 98f80beeac7f..19d5d4274e22 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3359,11 +3359,9 @@ static void kmem_cache_destroy_work_func(struct work_struct *w)
3359 * So if we aren't down to zero, we'll just schedule a worker and try 3359 * So if we aren't down to zero, we'll just schedule a worker and try
3360 * again 3360 * again
3361 */ 3361 */
3362 if (atomic_read(&cachep->memcg_params->nr_pages) != 0) { 3362 if (atomic_read(&cachep->memcg_params->nr_pages) != 0)
3363 kmem_cache_shrink(cachep); 3363 kmem_cache_shrink(cachep);
3364 if (atomic_read(&cachep->memcg_params->nr_pages) == 0) 3364 else
3365 return;
3366 } else
3367 kmem_cache_destroy(cachep); 3365 kmem_cache_destroy(cachep);
3368} 3366}
3369 3367