summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>2012-07-31 16:42:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-31 18:42:42 -0700
commit59b8e85c26e77d236ebdd61866ffc5e69c5f531d (patch)
treedeed7e77d0fdcd8a18477d59452cc0aa80f38238
parentfd07383b6bbc1418b1bdd5f295d13e600222fffa (diff)
memcg: remove check for signal_pending() during rmdir()
After bf544fdc241da8 "memcg: move charges to root cgroup if use_hierarchy=0 in mem_cgroup_move_hugetlb_parent()", no memory reclaim will occur when removing a memory cgroup. If -EINTR is returned here, cgroup will show a warning. We don't need to handle any user interruption signal. Remove this. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/memcontrol.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1940ba8e6f00..8062d45ee7f4 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3691,9 +3691,6 @@ move_account:
ret = -EBUSY;
if (cgroup_task_count(cgrp) || !list_empty(&cgrp->children))
goto out;
- ret = -EINTR;
- if (signal_pending(current))
- goto out;
/* This is for making all *used* pages to be on LRU. */
lru_add_drain_all();
drain_all_stock_sync(memcg);