hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IC97W5 ---------------------------------------------------------------------- Fix kabi break caused by previous patch. Fixes: cf455a5bcc22 ("ucount: use RCU for ucounts lookups") Fixes: 23679ab075f1 ("ucount: use rcuref_t for reference counting") Fixes: 6b0277f0afa1 ("ucounts: reinplement rlimit with percpu_counter") Signed-off-by: Chen Ridong <chenridong@huawei.com> --- include/linux/user_namespace.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 908d1bba7db17..37517ed7489a4 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -117,18 +117,21 @@ struct user_namespace { } __randomize_layout; struct ucounts { - struct hlist_nulls_node node; + KABI_DEPRECATE(struct hlist_node, node) struct user_namespace *ns; kuid_t uid; - struct rcu_head rcu; - rcuref_t count; + KABI_DEPRECATE(atomic_t, count) atomic_long_t ucount[UCOUNT_COUNTS]; #ifndef CONFIG_UCOUNTS_PERCPU_COUNTER atomic_long_t rlimit[UCOUNT_RLIMIT_COUNTS]; #else - struct percpu_counter rlimit[UCOUNT_RLIMIT_COUNTS]; - atomic_long_t freed; + KABI_DEPRECATE(atomic_long_t, rlimit[UCOUNT_RLIMIT_COUNTS]) + KABI_EXTEND(struct percpu_counter rlimit[UCOUNT_RLIMIT_COUNTS]) + KABI_EXTEND(atomic_long_t freed) #endif + KABI_EXTEND(struct hlist_nulls_node node) + KABI_EXTEND(struct rcu_head rcu) + KABI_EXTEND(rcuref_t count) }; extern struct user_namespace init_user_ns; -- 2.34.1