From: David Howells Date: Mon, 28 Jun 2010 13:05:04 +0000 (+0100) Subject: KEYS: Use the variable 'key' in keyctl_describe_key() X-Git-Tag: v2.6.36-rc1~584^2~41 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=94fd8405ea62bd2d4a40f3013e8e6935b6643235;p=net-next-2.6.git KEYS: Use the variable 'key' in keyctl_describe_key() keyctl_describe_key() turns the key reference it gets into a usable key pointer and assigns that to a variable called 'key', which it then ignores in favour of recomputing the key pointer each time it needs it. Make it use the precomputed pointer instead. Without this patch, gcc 4.6 reports that the variable key is set but not used: building with gcc 4.6 I'm getting a warning message: CC security/keys/keyctl.o security/keys/keyctl.c: In function 'keyctl_describe_key': security/keys/keyctl.c:472:14: warning: variable 'key' set but not used Reported-by: Justin P. Mattock Signed-off-by: David Howells Signed-off-by: James Morris --- diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 639226afd0d..b2b0998d6ab 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -505,13 +505,11 @@ okay: ret = snprintf(tmpbuf, PAGE_SIZE - 1, "%s;%d;%d;%08x;%s", - key_ref_to_ptr(key_ref)->type->name, - key_ref_to_ptr(key_ref)->uid, - key_ref_to_ptr(key_ref)->gid, - key_ref_to_ptr(key_ref)->perm, - key_ref_to_ptr(key_ref)->description ? - key_ref_to_ptr(key_ref)->description : "" - ); + key->type->name, + key->uid, + key->gid, + key->perm, + key->description ?: ""); /* include a NUL char at the end of the data */ if (ret > PAGE_SIZE - 1)