aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/request_key.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2008-02-07 03:15:26 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:26 -0500
commite231c2ee64eb1c5cd3c63c31da9dac7d888dcf7f (patch)
treed4b17ef65960594681397a3acac02c2d248200b5 /security/keys/request_key.c
parentd1bc8e95445224276d7896b8b08cbb0b28a0ca80 (diff)
Convert ERR_PTR(PTR_ERR(p)) instances to ERR_CAST(p)
Convert instances of ERR_PTR(PTR_ERR(p)) to ERR_CAST(p) using: perl -spi -e 's/ERR_PTR[(]PTR_ERR[(](.*)[)][)]/ERR_CAST(\1)/' `grep -rl 'ERR_PTR[(]*PTR_ERR' fs crypto net security` Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r--security/keys/request_key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 6381e616c47..5ecc5057fb5 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -389,7 +389,7 @@ struct key *request_key_and_link(struct key_type *type,
389 if (!IS_ERR(key_ref)) { 389 if (!IS_ERR(key_ref)) {
390 key = key_ref_to_ptr(key_ref); 390 key = key_ref_to_ptr(key_ref);
391 } else if (PTR_ERR(key_ref) != -EAGAIN) { 391 } else if (PTR_ERR(key_ref) != -EAGAIN) {
392 key = ERR_PTR(PTR_ERR(key_ref)); 392 key = ERR_CAST(key_ref);
393 } else { 393 } else {
394 /* the search failed, but the keyrings were searchable, so we 394 /* the search failed, but the keyrings were searchable, so we
395 * should consult userspace if we can */ 395 * should consult userspace if we can */