Commit 3c745417 authored Jul 23, 2017 by Tejun Heo

cgroup: fix error return value from cgroup_subtree_control()



While refactoring, f7b2814b ("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 <tj@kernel.org>
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: Tejun Heo <tj@kernel.org>

parent 7af608e4

kernel/cgroup/cgroup.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;