From d72c24680fce552433b4df5ddc04347e336545f8 Mon Sep 17 00:00:00 2001 From: Hou Tao Date: Sun, 5 May 2019 16:51:34 +0800 Subject: [PATCH] cgroup: undo unnecessary updates to struct cgroup_subsys & cftype euler inclusion category: bugfix bugzilla: 14007 CVE: NA ------------------------------------------------- These updates are leftovers from CentOS 7.x, and are not needed on hulk-4.19, so kill them. Fixes: 52cc1eccf6de ("cgroups: Resource controller for open files") Signed-off-by: Hou Tao Reviewed-by: luojiajun Signed-off-by: Yang Yingliang --- include/linux/cgroup-defs.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index d9bd671105e2..6002275937f5 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -569,12 +569,6 @@ struct cftype { ssize_t (*write)(struct kernfs_open_file *of, char *buf, size_t nbytes, loff_t off); - int (*read_seq_string)(struct cgroup *cont, struct cftype *cft, - struct seq_file *m); - - int (*write_string)(struct cgroup *cgrp, struct cftype *cft, - const char *buffer); - #ifdef CONFIG_DEBUG_LOCK_ALLOC struct lock_class_key lockdep_key; #endif @@ -673,7 +667,7 @@ struct cgroup_subsys { */ struct cftype *dfl_cftypes; /* for the default hierarchy */ struct cftype *legacy_cftypes; /* for the legacy hierarchies */ - struct cftype *base_cftypes; + /* * A subsystem may depend on other subsystems. When such subsystem * is enabled on a cgroup, the depended-upon subsystems are enabled -- GitLab