From: Tejun Heo <tj@kernel.org>
Date: Tue, 23 Feb 2016 03:25:45 +0000 (-0500)
Subject: cgroup: fix error return value of cgroup_addrm_files()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b598dde354de22d87f664a7b99b8c21437da8efb;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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)