hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP72X CVE: CVE-2022-49647 ---------------------------------------------------------------------- Fix kabi caused by previous patch. Fixes: 841559cb46db ("cgroup: Use separate src/dst nodes when preloading css_sets for migration") Signed-off-by: Chen Ridong <chenridong@huawei.com> --- include/linux/cgroup-defs.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 77c5cbf7662f..9f53d0bb653b 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -237,12 +237,8 @@ struct css_set { */ struct list_head cgrp_links; - /* - * List of csets participating in the on-going migration either as - * source or destination. Protected by cgroup_mutex. - */ - struct list_head mg_src_preload_node; - struct list_head mg_dst_preload_node; + /* No use, just keep the KABI same. */ + struct list_head mg_preload_node; struct list_head mg_node; /* @@ -261,6 +257,15 @@ struct css_set { /* For RCU-protected deletion */ struct rcu_head rcu_head; + +#ifndef __GENKSYMS__ + /* + * List of csets participating in the on-going migration either as + * source or destination. Protected by cgroup_mutex. + */ + struct list_head mg_src_preload_node; + struct list_head mg_dst_preload_node; +#endif }; struct cgroup_base_stat { -- 2.34.1