2023-07-17 15:05:12

by Kamalesh Babulal

Subject: [PATCH] cgroup: remove cgrp->kn check in css_populate_dir()

cgroup_create() creates cgrp and assigns the kernfs_node to cgrp->kn,
then cgroup_mkdir() populates base and csses cft file by calling
css_populate_dir() and cgroup_apply_control_enable() with a valid
cgrp->kn. Check for NULL cgrp->kn, will always be false, remove it.

Signed-off-by: Kamalesh Babulal <[email protected]>
---
kernel/cgroup/cgroup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index f55a40db065f..5294fbfb4bf4 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1736,7 +1736,7 @@ static int css_populate_dir(struct cgroup_subsys_state *css)
struct cftype *cfts, *failed_cfts;
int ret;

- if ((css->flags & CSS_VISIBLE) || !cgrp->kn)
+ if (css->flags & CSS_VISIBLE)
return 0;

if (!css->ss) {

base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c
--
2.34.3

2023-07-17 19:15:43

by Tejun Heo

Subject: Re: [PATCH] cgroup: remove cgrp->kn check in css_populate_dir()

On Mon, Jul 17, 2023 at 08:09:23PM +0530, Kamalesh Babulal wrote:
> cgroup_create() creates cgrp and assigns the kernfs_node to cgrp->kn,
> then cgroup_mkdir() populates base and csses cft file by calling
> css_populate_dir() and cgroup_apply_control_enable() with a valid
> cgrp->kn. Check for NULL cgrp->kn, will always be false, remove it.
>
> Signed-off-by: Kamalesh Babulal <[email protected]>

Applied to cgroup/for-6.6.

Thanks.

--
tejun