|
@@ -611,8 +611,8 @@ static void cgroup_update_populated(struct cgroup *cgrp, bool populated)
|
|
|
if (!trigger)
|
|
|
break;
|
|
|
|
|
|
- if (cgrp->populated_kn)
|
|
|
- kernfs_notify(cgrp->populated_kn);
|
|
|
+ if (cgrp->events_kn)
|
|
|
+ kernfs_notify(cgrp->events_kn);
|
|
|
cgrp = cgroup_parent(cgrp);
|
|
|
} while (cgrp);
|
|
|
}
|
|
@@ -3045,9 +3045,10 @@ err_undo_css:
|
|
|
goto out_unlock;
|
|
|
}
|
|
|
|
|
|
-static int cgroup_populated_show(struct seq_file *seq, void *v)
|
|
|
+static int cgroup_events_show(struct seq_file *seq, void *v)
|
|
|
{
|
|
|
- seq_printf(seq, "%d\n", (bool)seq_css(seq)->cgroup->populated_cnt);
|
|
|
+ seq_printf(seq, "populated %d\n",
|
|
|
+ (bool)seq_css(seq)->cgroup->populated_cnt);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -3214,8 +3215,8 @@ static int cgroup_add_file(struct cgroup *cgrp, struct cftype *cft)
|
|
|
|
|
|
if (cft->write == cgroup_procs_write)
|
|
|
cgrp->procs_kn = kn;
|
|
|
- else if (cft->seq_show == cgroup_populated_show)
|
|
|
- cgrp->populated_kn = kn;
|
|
|
+ else if (cft->seq_show == cgroup_events_show)
|
|
|
+ cgrp->events_kn = kn;
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -4388,9 +4389,9 @@ static struct cftype cgroup_dfl_base_files[] = {
|
|
|
.write = cgroup_subtree_control_write,
|
|
|
},
|
|
|
{
|
|
|
- .name = "cgroup.populated",
|
|
|
+ .name = "cgroup.events",
|
|
|
.flags = CFTYPE_NOT_ON_ROOT,
|
|
|
- .seq_show = cgroup_populated_show,
|
|
|
+ .seq_show = cgroup_events_show,
|
|
|
},
|
|
|
{ } /* terminate */
|
|
|
};
|