[PATCH 1/6] cgroup: fix error return value of cgroup_addrm_files()

From: Tejun Heo
Date: Mon Feb 22 2016 - 18:07:46 EST


cgroup_addrm_files() incorrectly returned 0 after add failure. Fix
it.

Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
---
kernel/cgroup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7ad6191..68b032d 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 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,
cgroup_rm_file(cgrp, cft);
}
}
- return 0;
+ return ret;
}

static int cgroup_apply_cftypes(struct cftype *cfts, bool is_add)
--
2.5.0