aboutsummaryrefslogtreecommitdiffstats
path: root/net
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 /net
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 'net')
-rw-r--r--net/rxrpc/af_rxrpc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 5e82f1c0afb..2d0c29c837f 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -239,7 +239,7 @@ static struct rxrpc_transport *rxrpc_name_to_transport(struct socket *sock,
239 /* find a remote transport endpoint from the local one */ 239 /* find a remote transport endpoint from the local one */
240 peer = rxrpc_get_peer(srx, gfp); 240 peer = rxrpc_get_peer(srx, gfp);
241 if (IS_ERR(peer)) 241 if (IS_ERR(peer))
242 return ERR_PTR(PTR_ERR(peer)); 242 return ERR_CAST(peer);
243 243
244 /* find a transport */ 244 /* find a transport */
245 trans = rxrpc_get_transport(rx->local, peer, gfp); 245 trans = rxrpc_get_transport(rx->local, peer, gfp);
@@ -282,7 +282,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
282 trans = rxrpc_name_to_transport(sock, (struct sockaddr *) srx, 282 trans = rxrpc_name_to_transport(sock, (struct sockaddr *) srx,
283 sizeof(*srx), 0, gfp); 283 sizeof(*srx), 0, gfp);
284 if (IS_ERR(trans)) { 284 if (IS_ERR(trans)) {
285 call = ERR_PTR(PTR_ERR(trans)); 285 call = ERR_CAST(trans);
286 trans = NULL; 286 trans = NULL;
287 goto out; 287 goto out;
288 } 288 }
@@ -306,7 +306,7 @@ struct rxrpc_call *rxrpc_kernel_begin_call(struct socket *sock,
306 306
307 bundle = rxrpc_get_bundle(rx, trans, key, service_id, gfp); 307 bundle = rxrpc_get_bundle(rx, trans, key, service_id, gfp);
308 if (IS_ERR(bundle)) { 308 if (IS_ERR(bundle)) {
309 call = ERR_PTR(PTR_ERR(bundle)); 309 call = ERR_CAST(bundle);
310 goto out; 310 goto out;
311 } 311 }
312 312