From: Adrian Bunk This patch contains the following possible cleanups: - make needlessly global code static - #if 0 the following unused global function: - keys/key.c: key_duplicate Signed-off-by: Adrian Bunk Cc: David Howells Signed-off-by: Andrew Morton --- security/keys/internal.h | 1 - security/keys/key.c | 4 +++- security/keys/keyring.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff -puN security/keys/internal.h~security-possible-cleanups security/keys/internal.h --- devel/security/keys/internal.h~security-possible-cleanups 2005-11-07 19:39:38.000000000 -0800 +++ devel-akpm/security/keys/internal.h 2005-11-07 19:39:38.000000000 -0800 @@ -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 -puN security/keys/key.c~security-possible-cleanups security/keys/key.c --- devel/security/keys/key.c~security-possible-cleanups 2005-11-07 19:39:38.000000000 -0800 +++ devel-akpm/security/keys/key.c 2005-11-07 19:39:38.000000000 -0800 @@ -36,7 +36,7 @@ static DECLARE_WORK(key_cleanup_task, ke 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", }; @@ -892,6 +892,7 @@ EXPORT_SYMBOL(key_update); * duplicate a key, potentially with a revised description * - must be supported by the keytype (keyrings for instance can be duplicated) */ +#if 0 struct key *key_duplicate(struct key *source, const char *desc) { struct key *key; @@ -936,6 +937,7 @@ struct key *key_duplicate(struct key *so goto out; } /* end key_duplicate() */ +#endif /* 0 */ /*****************************************************************************/ /* diff -puN security/keys/keyring.c~security-possible-cleanups security/keys/keyring.c --- devel/security/keys/keyring.c~security-possible-cleanups 2005-11-07 19:39:38.000000000 -0800 +++ devel-akpm/security/keys/keyring.c 2005-11-07 19:39:38.000000000 -0800 @@ -70,7 +70,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); /*****************************************************************************/ /* _