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>

4 files changed, 4 insertions, 4 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index fdd5ca6d89fc..654d23baf352 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -820,7 +820,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref,
         key = key_alloc(ktype, description, current->fsuid, current->fsgid,
                         current, perm, flags);
         if (IS_ERR(key)) {
-                key_ref = ERR_PTR(PTR_ERR(key));
+                key_ref = ERR_CAST(key);
                 goto error_3;
         }
 
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 2a0eb946fc7e..c886a2bb792a 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -660,7 +660,7 @@ key_ref_t lookup_user_key(struct task_struct *context, key_serial_t id,
 
                 key = key_lookup(id);
                 if (IS_ERR(key)) {
-                        key_ref = ERR_PTR(PTR_ERR(key));
+                        key_ref = ERR_CAST(key);
                         goto error;
                 }
 
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 6381e616c477..5ecc5057fb54 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,
         if (!IS_ERR(key_ref)) {
                 key = key_ref_to_ptr(key_ref);
         } else if (PTR_ERR(key_ref) != -EAGAIN) {
-                key = ERR_PTR(PTR_ERR(key_ref));
+                key = ERR_CAST(key_ref);
         } else  {
                 /* the search failed, but the keyrings were searchable, so we
                  * should consult userspace if we can */
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index 510f7be73a2d..e42b5252486f 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -261,7 +261,7 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id)
                 current);
 
         if (IS_ERR(authkey_ref)) {
-                authkey = ERR_PTR(PTR_ERR(authkey_ref));
+                authkey = ERR_CAST(authkey_ref);
                 goto error;
         }