From: Adrian Bunk <bunk@stusta.de>
To: chrisw@osdl.org
Cc: linux-security-module@wirex.com, linux-kernel@vger.kernel.org
Subject: [2.6 patch] security/: possible cleanups
Date: Mon, 16 May 2005 20:45:01 +0200 [thread overview]
Message-ID: <20050516184501.GD5112@stusta.de> (raw)
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 <bunk@stusta.de>
---
security/keys/internal.h | 1 -
security/keys/key.c | 4 +++-
security/keys/keyring.c | 2 +-
security/seclvl.c | 4 ++--
4 files changed, 6 insertions(+), 5 deletions(-)
--- linux-2.6.12-rc4-mm1-full/security/keys/internal.h.old 2005-05-15 17:11:19.000000000 +0200
+++ linux-2.6.12-rc4-mm1-full/security/keys/internal.h 2005-05-15 17:11:23.000000000 +0200
@@ -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;
/*****************************************************************************/
--- linux-2.6.12-rc4-mm1-full/security/keys/key.c.old 2005-05-15 17:09:56.000000000 +0200
+++ linux-2.6.12-rc4-mm1-full/security/keys/key.c 2005-05-15 17:11:11.000000000 +0200
@@ -35,7 +35,7 @@
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",
};
@@ -860,6 +860,7 @@
* 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;
@@ -904,6 +905,7 @@
goto out;
} /* end key_duplicate() */
+#endif /* 0 */
/*****************************************************************************/
/*
--- linux-2.6.12-rc4-mm1-full/security/keys/keyring.c.old 2005-05-15 17:12:43.000000000 +0200
+++ linux-2.6.12-rc4-mm1-full/security/keys/keyring.c 2005-05-15 17:12:53.000000000 +0200
@@ -69,7 +69,7 @@
* 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);
/*****************************************************************************/
/*
--- linux-2.6.12-rc4-mm1-full/security/seclvl.c.old 2005-05-15 17:13:29.000000000 +0200
+++ linux-2.6.12-rc4-mm1-full/security/seclvl.c 2005-05-15 17:16:21.000000000 +0200
@@ -122,7 +122,7 @@
* kobject stuff
*/
-struct subsystem seclvl_subsys;
+static struct subsystem seclvl_subsys;
struct seclvl_obj {
char *name;
@@ -179,7 +179,7 @@
.sysfs_ops = &seclvlfs_sysfs_ops
};
-decl_subsys(seclvl, &seclvl_ktype, NULL);
+static decl_subsys(seclvl, &seclvl_ktype, NULL);
/**
* The actual security level. Ranges between -1 and 2 inclusive.
next reply other threads:[~2005-05-16 18:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-16 18:45 Adrian Bunk [this message]
2005-05-16 21:08 ` [2.6 patch] security/: possible cleanups Chris Wright
2005-05-17 14:08 ` David Howells
2005-05-30 19:41 ` Adrian Bunk
-- strict thread matches above, loose matches on Subject: below --
2005-10-31 0:33 Adrian Bunk
2005-11-07 21:18 Adrian Bunk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050516184501.GD5112@stusta.de \
--to=bunk@stusta.de \
--cc=chrisw@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@wirex.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox