projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5d04bb
)
memcg: remove redundant code in mem_cgroup_force_empty_write()
author
Li Zefan
<
[email protected]
>
Thu, 12 Sep 2013 22:13:19 +0000
(15:13 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 12 Sep 2013 22:38:00 +0000
(15:38 -0700)
vfs guarantees the cgroup won't be destroyed, so it's redundant to get a
css reference.
Signed-off-by: Li Zefan <
[email protected]
>
Acked-by: Michal Hocko <
[email protected]
>
Cc: KAMEZAWA Hiroyuki <
[email protected]
>
Cc: Johannes Weiner <
[email protected]
>
Cc: Tejun Heo <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/memcontrol.c
patch
|
blob
|
history
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index c6bd28edd533217c818a7e43f24e11ec191c37d2..fe6b9f96abddf6266490060d08bae8938224de26 100644
(file)
--- 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)
{