2021-03-14 16:31:14

by Alexey Dobriyan

[permalink] [raw]
Subject: [PATCH] cred: make init_groups static

Nothing really uses init_groups. It can be accessed via init_cred
if necessary.

Signed-off-by: Alexey Dobriyan <[email protected]>
---

include/linux/cred.h | 1 -
include/linux/init_task.h | 1 -
kernel/cred.c | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)

--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -53,7 +53,6 @@ do { \
groups_free(group_info); \
} while (0)

-extern struct group_info init_groups;
#ifdef CONFIG_MULTIUSER
extern struct group_info *groups_alloc(int);
extern void groups_free(struct group_info *);
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -25,7 +25,6 @@
extern struct files_struct init_files;
extern struct fs_struct init_fs;
extern struct nsproxy init_nsproxy;
-extern struct group_info init_groups;
extern struct cred init_cred;

#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -33,7 +33,7 @@ do { \
static struct kmem_cache *cred_jar;

/* init to 2 - one for init_task, one to ensure it is never freed */
-struct group_info init_groups = { .usage = ATOMIC_INIT(2) };
+static struct group_info init_groups = { .usage = ATOMIC_INIT(2) };

/*
* The initial credentials for the initial task