Merge branch 'for-4.10-fixes' into for-4.11 (bdf3d06b) · Commits · e / devices / android_kernel_fairphone_FP4

kernel/cgroup/cgroup.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -4071,6 +4071,11 @@ static struct cgroup_subsys_state css_create(struct cgroup cgrp,
		return ERR_PTR(err);
		}

		/*
		* The returned cgroup is fully initialized including its control mask, but
		* it isn't associated with its kernfs_node and doesn't have the control
		* mask applied.
		*/
		static struct cgroup cgroup_create(struct cgroup parent)
		{
		struct cgroup_root *root = parent->root;
		@@ -4138,11 +4143,6 @@ static struct cgroup cgroup_create(struct cgroup parent)

		cgroup_propagate_control(cgrp);

		/* @cgrp doesn't have dir yet so the following will only create csses */
		ret = cgroup_apply_control_enable(cgrp);
		if (ret)
		goto out_destroy;

		return cgrp;

		out_cancel_ref:
		@@ -4150,9 +4150,6 @@ static struct cgroup cgroup_create(struct cgroup parent)
		out_free_cgrp:
		kfree(cgrp);
		return ERR_PTR(ret);
		out_destroy:
		cgroup_destroy_locked(cgrp);
		return ERR_PTR(ret);
		}

		int cgroup_mkdir(struct kernfs_node parent_kn, const char name, umode_t mode)