Commit 7249db2c authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

keys: make key_serial() a function if CONFIG_KEYS=y 



Make key_serial() an inline function rather than a macro if CONFIG_KEYS=y.
This prevents double evaluation of the key pointer and also provides better
type checking.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fdb89bce

include/linux/key.h

+4 −1
Original line number Diff line number Diff line
@@ -264,7 +264,10 @@ extern int keyring_add_key(struct key *keyring, 


extern struct key *key_lookup(key_serial_t id);



#define key_serial(key) ((key) ? (key)->serial : 0)

static inline key_serial_t key_serial(struct key *key)

{

	return key ? key->serial : 0;

}



#ifdef CONFIG_SYSCTL

extern ctl_table key_sysctls[];