[PATCH] security/: possible cleanups

make needlessly global code static

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/security/keys/internal.h b/security/keys/internal.h
index db99ed434f3a7afd65624a689f94a2d59686f92e..39cba97c5eb9f63e88fd2d23efbbca62f72a165d 100644 (file)
--- a/security/keys/internal.h
+++ b/security/keys/internal.h
@@ -25,7 +25,6 @@
 #define kdebug(FMT, a...)      do {} while(0)
 #endif
 
-extern struct key_type key_type_dead;
 extern struct key_type key_type_user;
 
 /*****************************************************************************/

diff --git a/security/keys/key.c b/security/keys/key.c
index bb036623d0a83b93917b880fea16f316a806b65d..99781b798312f0da18bd7063aa9b7856f7fe48fa 100644 (file)
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -36,7 +36,7 @@ static DECLARE_WORK(key_cleanup_task, key_cleanup, NULL);
 DECLARE_RWSEM(key_construction_sem);
 
 /* any key who's type gets unegistered will be re-typed to this */
-struct key_type key_type_dead = {
+static struct key_type key_type_dead = {
        .name           = "dead",
 };
 

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 0acecbd4fa37bd43c63419ca7b7c5c9e1fe3bd4c..5d22c0388b326bcc64fd134d24534e5d97da4d09 100644 (file)
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -68,7 +68,7 @@ struct key_type key_type_keyring = {
  * semaphore to serialise link/link calls to prevent two link calls in parallel
  * introducing a cycle
  */
-DECLARE_RWSEM(keyring_serialise_link_sem);
+static DECLARE_RWSEM(keyring_serialise_link_sem);
 
 /*****************************************************************************/
 /*