cgroup: fix error return value from cgroup_subtree_control()

While refactoring, f7b2814 ("cgroup: factor out cgroup_{apply|finalize}_control() from cgroup_subtree_control_write()") broke error return value from the function. The return value from the last operation is always overridden to zero. Fix it. Signed-off-by: Tejun Heo <[email protected]> Cc: [email protected] # v4.6+ Signed-off-by: Tejun Heo <[email protected]>
josf · Jul 23, 2017 · 3c74541 · 3c74541
1 parent 7af608e
commit 3c74541
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
@@ -3001,11 +3001,11 @@ static ssize_t cgroup_subtree_control_write(struct kernfs_open_file *of,
 	cgrp->subtree_control &= ~disable;
 
 	ret = cgroup_apply_control(cgrp);
-
 	cgroup_finalize_control(cgrp, ret);
+	if (ret)
+		goto out_unlock;
 
 	kernfs_activate(cgrp->kn);
-	ret = 0;
 out_unlock:
 	cgroup_kn_unlock(of->kn);
 	return ret ?: nbytes;