From: Hou Tao houtao1@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I7VO77
--------------------------------
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 houtao1@huawei.com Reviewed-by: luojiajun luojiajun3@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com Signed-off-by: Lu Jialin lujialin4@huawei.com --- 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 844ccf4187ed..8a0d5466c7be 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -639,12 +639,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); - __poll_t (*poll)(struct kernfs_open_file *of, struct poll_table_struct *pt);
@@ -732,7 +726,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