summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2013-09-12 15:13:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 15:38:00 -0700
commitc33bd8354f3a3bb26a98d2b6bf600b7b35657328 (patch)
tree3a05898992a6bf4475051d9b49ace72f304473cf /mm
parentd5d04bb48f0eb89c14e76779bb46212494de0bec (diff)
downloadlinux-c33bd8354f3a3bb26a98d2b6bf600b7b35657328.tar.gz
linux-c33bd8354f3a3bb26a98d2b6bf600b7b35657328.tar.bz2
linux-c33bd8354f3a3bb26a98d2b6bf600b7b35657328.zip
memcg: remove redundant code in mem_cgroup_force_empty_write()
vfs guarantees the cgroup won't be destroyed, so it's redundant to get a css reference. Signed-off-by: Li Zefan <lizefan@huawei.com> Acked-by: Michal Hocko <mhocko@suse.cz> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Tejun Heo <tj@kernel.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.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index c6bd28edd533..fe6b9f96abdd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4990,18 +4990,12 @@ static int mem_cgroup_force_empty_write(struct cgroup_subsys_state *css,
unsigned int event)
{
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
- int ret;
if (mem_cgroup_is_root(memcg))
return -EINVAL;
- css_get(&memcg->css);
- ret = mem_cgroup_force_empty(memcg);
- css_put(&memcg->css);
-
- return ret;
+ return mem_cgroup_force_empty(memcg);
}
-
static u64 mem_cgroup_hierarchy_read(struct cgroup_subsys_state *css,
struct cftype *cft)
{