hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC97W5 ---------------------------------------------------------------------- Fix kabi break caused by previous patch. Fixes: 1280510fda96 ("ucount: use RCU for ucounts lookups") Fixes: a4c834ba39c9 ("ucount: use rcuref_t for reference counting") Fixes: d73a45212afd ("ucounts: turn the atomic rlimit to percpu_counter") Signed-off-by: Chen Ridong <chenridong@huawei.com> --- include/linux/user_namespace.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 0f6cf35c831f7..ac928e6e70427 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -115,14 +115,26 @@ struct user_namespace { } __randomize_layout; struct ucounts { +#ifdef __GENKSYMS__ + struct hlist_node node; +#else struct hlist_nulls_node node; +#endif struct user_namespace *ns; kuid_t uid; +#ifdef __GENKSYMS__ + atomic_t count; +#else struct rcu_head rcu; rcuref_t count; atomic_long_t freed; +#endif atomic_long_t ucount[UCOUNT_COUNTS]; +#ifdef __GENKSYMS__ + atomic_long_t rlimit[UCOUNT_RLIMIT_COUNTS]; +#else struct percpu_counter rlimit[UCOUNT_RLIMIT_COUNTS]; +#endif }; extern struct user_namespace init_user_ns; -- 2.34.1