From: Miaohe Lin <linmiaohe@huawei.com>
Date: Sun, 29 Sep 2019 08:06:58 +0000 (+0800)
Subject: cgroup: short-circuit current_cgns_cgroup_from_root() on the default hierarchy
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=61e867fde21ea94f2166899f24f16cad85cc7b24;p=openwrt%2Fstaging%2Fblogic.git

cgroup: short-circuit current_cgns_cgroup_from_root() on the default hierarchy

Like commit 13d82fb77abb ("cgroup: short-circuit cset_cgroup_from_root() on
the default hierarchy"), short-circuit current_cgns_cgroup_from_root() on
the default hierarchy.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
---

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 080561bb8a4b..f6cba23290a1 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1374,6 +1374,8 @@ current_cgns_cgroup_from_root(struct cgroup_root *root)
 	cset = current->nsproxy->cgroup_ns->root_cset;
 	if (cset == &init_css_set) {
 		res = &root->cgrp;
+	} else if (root == &cgrp_dfl_root) {
+		res = cset->dfl_cgrp;
 	} else {
 		struct cgrp_cset_link *link;