summaryrefslogtreecommitdiff
path: root/kernel/cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2016-02-22 22:25:45 -0500
committerTejun Heo <tj@kernel.org>2016-02-22 22:25:45 -0500
commitb598dde354de22d87f664a7b99b8c21437da8efb (patch)
treece9d1050e1e61ecefca426fe5b2da185b31abfe9 /kernel/cgroup.c
parent1619b6d4fdd776b1b91bd288ad6f7e37fe183485 (diff)
downloadlinux-sh-b598dde354de22d87f664a7b99b8c21437da8efb.tar.gz
cgroup: fix error return value of cgroup_addrm_files()
cgroup_addrm_files() incorrectly returned 0 after add failure. Fix it. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r--kernel/cgroup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7ad61915967f..68b032df77f5 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3369,7 +3369,7 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,
bool is_add)
{
struct cftype *cft, *cft_end = NULL;
- int ret;
+ int ret = 0;
lockdep_assert_held(&cgroup_mutex);
@@ -3398,7 +3398,7 @@ restart:
cgroup_rm_file(cgrp, cft);
}
}
- return 0;
+ return ret;
}
static int cgroup_apply_cftypes(struct cftype *cfts, bool is_add)