Message ID | 20210106132622.1122033-4-omosnace@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Paul Moore |
Headers | show |
Series | Clean up SELinux global variables | expand |
On Wed, Jan 6, 2021 at 8:26 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > It is not referenced outside selinuxfs.c, so remove its extern header > declaration and make it static. > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > --- > security/selinux/include/security.h | 1 - > security/selinux/selinuxfs.c | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) Merged into selinux/next, thanks.
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 3cc8bab31ea85..765a258a899ef 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -436,7 +436,6 @@ extern void selinux_complete_init(void); extern int selinux_disable(struct selinux_state *state); extern void exit_sel_fs(void); extern struct path selinux_null; -extern struct vfsmount *selinuxfs_mount; extern void selnl_notify_setenforce(int val); extern void selnl_notify_policyload(u32 seqno); extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm); diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 4bde570d56a2c..4fdfe7b67df89 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -2204,7 +2204,7 @@ static struct file_system_type sel_fs_type = { .kill_sb = sel_kill_sb, }; -struct vfsmount *selinuxfs_mount; +static struct vfsmount *selinuxfs_mount; struct path selinux_null; static int __init init_sel_fs(void)
It is not referenced outside selinuxfs.c, so remove its extern header declaration and make it static. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- security/selinux/include/security.h | 1 - security/selinux/selinuxfs.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)