diff options
author | Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | 2012-07-31 19:42:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:42 -0400 |
commit | 59b8e85c26e77d236ebdd61866ffc5e69c5f531d (patch) | |
tree | deed7e77d0fdcd8a18477d59452cc0aa80f38238 /mm/memcontrol.c | |
parent | fd07383b6bbc1418b1bdd5f295d13e600222fffa (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>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 3 |
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: | |||
3691 | ret = -EBUSY; | 3691 | ret = -EBUSY; |
3692 | if (cgroup_task_count(cgrp) || !list_empty(&cgrp->children)) | 3692 | if (cgroup_task_count(cgrp) || !list_empty(&cgrp->children)) |
3693 | goto out; | 3693 | goto out; |
3694 | ret = -EINTR; | ||
3695 | if (signal_pending(current)) | ||
3696 | goto out; | ||
3697 | /* This is for making all *used* pages to be on LRU. */ | 3694 | /* This is for making all *used* pages to be on LRU. */ |
3698 | lru_add_drain_all(); | 3695 | lru_add_drain_all(); |
3699 | drain_all_stock_sync(memcg); | 3696 | drain_all_stock_sync(memcg); |