diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/sunrpc | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 2 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 44 | ||||
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 12 | ||||
-rw-r--r-- | net/sunrpc/rpcb_clnt.c | 20 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
5 files changed, 40 insertions, 40 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 6dac38792288..5828e5c060ca 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
@@ -625,7 +625,7 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor) | |||
625 | gss_auth->mech = gss_mech_get_by_pseudoflavor(flavor); | 625 | gss_auth->mech = gss_mech_get_by_pseudoflavor(flavor); |
626 | if (!gss_auth->mech) { | 626 | if (!gss_auth->mech) { |
627 | printk(KERN_WARNING "%s: Pseudoflavor %d not found!\n", | 627 | printk(KERN_WARNING "%s: Pseudoflavor %d not found!\n", |
628 | __FUNCTION__, flavor); | 628 | __func__, flavor); |
629 | goto err_free; | 629 | goto err_free; |
630 | } | 630 | } |
631 | gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor); | 631 | gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor); |
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 8c6a7f1a25e9..13a3718e7cc9 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -43,7 +43,7 @@ | |||
43 | 43 | ||
44 | #define dprint_status(t) \ | 44 | #define dprint_status(t) \ |
45 | dprintk("RPC: %5u %s (status %d)\n", t->tk_pid, \ | 45 | dprintk("RPC: %5u %s (status %d)\n", t->tk_pid, \ |
46 | __FUNCTION__, t->tk_status) | 46 | __func__, t->tk_status) |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * All RPC clients are linked into this list | 49 | * All RPC clients are linked into this list |
@@ -372,7 +372,7 @@ out_no_path: | |||
372 | out_no_stats: | 372 | out_no_stats: |
373 | kfree(new); | 373 | kfree(new); |
374 | out_no_clnt: | 374 | out_no_clnt: |
375 | dprintk("RPC: %s: returned error %d\n", __FUNCTION__, err); | 375 | dprintk("RPC: %s: returned error %d\n", __func__, err); |
376 | return ERR_PTR(err); | 376 | return ERR_PTR(err); |
377 | } | 377 | } |
378 | EXPORT_SYMBOL_GPL(rpc_clone_client); | 378 | EXPORT_SYMBOL_GPL(rpc_clone_client); |
@@ -756,7 +756,7 @@ call_reserveresult(struct rpc_task *task) | |||
756 | } | 756 | } |
757 | 757 | ||
758 | printk(KERN_ERR "%s: status=%d, but no request slot, exiting\n", | 758 | printk(KERN_ERR "%s: status=%d, but no request slot, exiting\n", |
759 | __FUNCTION__, status); | 759 | __func__, status); |
760 | rpc_exit(task, -EIO); | 760 | rpc_exit(task, -EIO); |
761 | return; | 761 | return; |
762 | } | 762 | } |
@@ -767,7 +767,7 @@ call_reserveresult(struct rpc_task *task) | |||
767 | */ | 767 | */ |
768 | if (task->tk_rqstp) { | 768 | if (task->tk_rqstp) { |
769 | printk(KERN_ERR "%s: status=%d, request allocated anyway\n", | 769 | printk(KERN_ERR "%s: status=%d, request allocated anyway\n", |
770 | __FUNCTION__, status); | 770 | __func__, status); |
771 | xprt_release(task); | 771 | xprt_release(task); |
772 | } | 772 | } |
773 | 773 | ||
@@ -779,7 +779,7 @@ call_reserveresult(struct rpc_task *task) | |||
779 | break; | 779 | break; |
780 | default: | 780 | default: |
781 | printk(KERN_ERR "%s: unrecognized error %d, exiting\n", | 781 | printk(KERN_ERR "%s: unrecognized error %d, exiting\n", |
782 | __FUNCTION__, status); | 782 | __func__, status); |
783 | break; | 783 | break; |
784 | } | 784 | } |
785 | rpc_exit(task, status); | 785 | rpc_exit(task, status); |
@@ -1327,7 +1327,7 @@ call_verify(struct rpc_task *task) | |||
1327 | * undefined results | 1327 | * undefined results |
1328 | */ | 1328 | */ |
1329 | dprintk("RPC: %5u %s: XDR representation not a multiple of" | 1329 | dprintk("RPC: %5u %s: XDR representation not a multiple of" |
1330 | " 4 bytes: 0x%x\n", task->tk_pid, __FUNCTION__, | 1330 | " 4 bytes: 0x%x\n", task->tk_pid, __func__, |
1331 | task->tk_rqstp->rq_rcv_buf.len); | 1331 | task->tk_rqstp->rq_rcv_buf.len); |
1332 | goto out_eio; | 1332 | goto out_eio; |
1333 | } | 1333 | } |
@@ -1337,7 +1337,7 @@ call_verify(struct rpc_task *task) | |||
1337 | 1337 | ||
1338 | if ((n = ntohl(*p++)) != RPC_REPLY) { | 1338 | if ((n = ntohl(*p++)) != RPC_REPLY) { |
1339 | dprintk("RPC: %5u %s: not an RPC reply: %x\n", | 1339 | dprintk("RPC: %5u %s: not an RPC reply: %x\n", |
1340 | task->tk_pid, __FUNCTION__, n); | 1340 | task->tk_pid, __func__, n); |
1341 | goto out_garbage; | 1341 | goto out_garbage; |
1342 | } | 1342 | } |
1343 | if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) { | 1343 | if ((n = ntohl(*p++)) != RPC_MSG_ACCEPTED) { |
@@ -1349,13 +1349,13 @@ call_verify(struct rpc_task *task) | |||
1349 | case RPC_MISMATCH: | 1349 | case RPC_MISMATCH: |
1350 | dprintk("RPC: %5u %s: RPC call version " | 1350 | dprintk("RPC: %5u %s: RPC call version " |
1351 | "mismatch!\n", | 1351 | "mismatch!\n", |
1352 | task->tk_pid, __FUNCTION__); | 1352 | task->tk_pid, __func__); |
1353 | error = -EPROTONOSUPPORT; | 1353 | error = -EPROTONOSUPPORT; |
1354 | goto out_err; | 1354 | goto out_err; |
1355 | default: | 1355 | default: |
1356 | dprintk("RPC: %5u %s: RPC call rejected, " | 1356 | dprintk("RPC: %5u %s: RPC call rejected, " |
1357 | "unknown error: %x\n", | 1357 | "unknown error: %x\n", |
1358 | task->tk_pid, __FUNCTION__, n); | 1358 | task->tk_pid, __func__, n); |
1359 | goto out_eio; | 1359 | goto out_eio; |
1360 | } | 1360 | } |
1361 | if (--len < 0) | 1361 | if (--len < 0) |
@@ -1369,7 +1369,7 @@ call_verify(struct rpc_task *task) | |||
1369 | break; | 1369 | break; |
1370 | task->tk_cred_retry--; | 1370 | task->tk_cred_retry--; |
1371 | dprintk("RPC: %5u %s: retry stale creds\n", | 1371 | dprintk("RPC: %5u %s: retry stale creds\n", |
1372 | task->tk_pid, __FUNCTION__); | 1372 | task->tk_pid, __func__); |
1373 | rpcauth_invalcred(task); | 1373 | rpcauth_invalcred(task); |
1374 | /* Ensure we obtain a new XID! */ | 1374 | /* Ensure we obtain a new XID! */ |
1375 | xprt_release(task); | 1375 | xprt_release(task); |
@@ -1382,7 +1382,7 @@ call_verify(struct rpc_task *task) | |||
1382 | break; | 1382 | break; |
1383 | task->tk_garb_retry--; | 1383 | task->tk_garb_retry--; |
1384 | dprintk("RPC: %5u %s: retry garbled creds\n", | 1384 | dprintk("RPC: %5u %s: retry garbled creds\n", |
1385 | task->tk_pid, __FUNCTION__); | 1385 | task->tk_pid, __func__); |
1386 | task->tk_action = call_bind; | 1386 | task->tk_action = call_bind; |
1387 | goto out_retry; | 1387 | goto out_retry; |
1388 | case RPC_AUTH_TOOWEAK: | 1388 | case RPC_AUTH_TOOWEAK: |
@@ -1391,16 +1391,16 @@ call_verify(struct rpc_task *task) | |||
1391 | break; | 1391 | break; |
1392 | default: | 1392 | default: |
1393 | dprintk("RPC: %5u %s: unknown auth error: %x\n", | 1393 | dprintk("RPC: %5u %s: unknown auth error: %x\n", |
1394 | task->tk_pid, __FUNCTION__, n); | 1394 | task->tk_pid, __func__, n); |
1395 | error = -EIO; | 1395 | error = -EIO; |
1396 | } | 1396 | } |
1397 | dprintk("RPC: %5u %s: call rejected %d\n", | 1397 | dprintk("RPC: %5u %s: call rejected %d\n", |
1398 | task->tk_pid, __FUNCTION__, n); | 1398 | task->tk_pid, __func__, n); |
1399 | goto out_err; | 1399 | goto out_err; |
1400 | } | 1400 | } |
1401 | if (!(p = rpcauth_checkverf(task, p))) { | 1401 | if (!(p = rpcauth_checkverf(task, p))) { |
1402 | dprintk("RPC: %5u %s: auth check failed\n", | 1402 | dprintk("RPC: %5u %s: auth check failed\n", |
1403 | task->tk_pid, __FUNCTION__); | 1403 | task->tk_pid, __func__); |
1404 | goto out_garbage; /* bad verifier, retry */ | 1404 | goto out_garbage; /* bad verifier, retry */ |
1405 | } | 1405 | } |
1406 | len = p - (__be32 *)iov->iov_base - 1; | 1406 | len = p - (__be32 *)iov->iov_base - 1; |
@@ -1411,14 +1411,14 @@ call_verify(struct rpc_task *task) | |||
1411 | return p; | 1411 | return p; |
1412 | case RPC_PROG_UNAVAIL: | 1412 | case RPC_PROG_UNAVAIL: |
1413 | dprintk("RPC: %5u %s: program %u is unsupported by server %s\n", | 1413 | dprintk("RPC: %5u %s: program %u is unsupported by server %s\n", |
1414 | task->tk_pid, __FUNCTION__, | 1414 | task->tk_pid, __func__, |
1415 | (unsigned int)task->tk_client->cl_prog, | 1415 | (unsigned int)task->tk_client->cl_prog, |
1416 | task->tk_client->cl_server); | 1416 | task->tk_client->cl_server); |
1417 | error = -EPFNOSUPPORT; | 1417 | error = -EPFNOSUPPORT; |
1418 | goto out_err; | 1418 | goto out_err; |
1419 | case RPC_PROG_MISMATCH: | 1419 | case RPC_PROG_MISMATCH: |
1420 | dprintk("RPC: %5u %s: program %u, version %u unsupported by " | 1420 | dprintk("RPC: %5u %s: program %u, version %u unsupported by " |
1421 | "server %s\n", task->tk_pid, __FUNCTION__, | 1421 | "server %s\n", task->tk_pid, __func__, |
1422 | (unsigned int)task->tk_client->cl_prog, | 1422 | (unsigned int)task->tk_client->cl_prog, |
1423 | (unsigned int)task->tk_client->cl_vers, | 1423 | (unsigned int)task->tk_client->cl_vers, |
1424 | task->tk_client->cl_server); | 1424 | task->tk_client->cl_server); |
@@ -1427,7 +1427,7 @@ call_verify(struct rpc_task *task) | |||
1427 | case RPC_PROC_UNAVAIL: | 1427 | case RPC_PROC_UNAVAIL: |
1428 | dprintk("RPC: %5u %s: proc %p unsupported by program %u, " | 1428 | dprintk("RPC: %5u %s: proc %p unsupported by program %u, " |
1429 | "version %u on server %s\n", | 1429 | "version %u on server %s\n", |
1430 | task->tk_pid, __FUNCTION__, | 1430 | task->tk_pid, __func__, |
1431 | task->tk_msg.rpc_proc, | 1431 | task->tk_msg.rpc_proc, |
1432 | task->tk_client->cl_prog, | 1432 | task->tk_client->cl_prog, |
1433 | task->tk_client->cl_vers, | 1433 | task->tk_client->cl_vers, |
@@ -1436,11 +1436,11 @@ call_verify(struct rpc_task *task) | |||
1436 | goto out_err; | 1436 | goto out_err; |
1437 | case RPC_GARBAGE_ARGS: | 1437 | case RPC_GARBAGE_ARGS: |
1438 | dprintk("RPC: %5u %s: server saw garbage\n", | 1438 | dprintk("RPC: %5u %s: server saw garbage\n", |
1439 | task->tk_pid, __FUNCTION__); | 1439 | task->tk_pid, __func__); |
1440 | break; /* retry */ | 1440 | break; /* retry */ |
1441 | default: | 1441 | default: |
1442 | dprintk("RPC: %5u %s: server accept status: %x\n", | 1442 | dprintk("RPC: %5u %s: server accept status: %x\n", |
1443 | task->tk_pid, __FUNCTION__, n); | 1443 | task->tk_pid, __func__, n); |
1444 | /* Also retry */ | 1444 | /* Also retry */ |
1445 | } | 1445 | } |
1446 | 1446 | ||
@@ -1449,7 +1449,7 @@ out_garbage: | |||
1449 | if (task->tk_garb_retry) { | 1449 | if (task->tk_garb_retry) { |
1450 | task->tk_garb_retry--; | 1450 | task->tk_garb_retry--; |
1451 | dprintk("RPC: %5u %s: retrying\n", | 1451 | dprintk("RPC: %5u %s: retrying\n", |
1452 | task->tk_pid, __FUNCTION__); | 1452 | task->tk_pid, __func__); |
1453 | task->tk_action = call_bind; | 1453 | task->tk_action = call_bind; |
1454 | out_retry: | 1454 | out_retry: |
1455 | return ERR_PTR(-EAGAIN); | 1455 | return ERR_PTR(-EAGAIN); |
@@ -1459,11 +1459,11 @@ out_eio: | |||
1459 | out_err: | 1459 | out_err: |
1460 | rpc_exit(task, error); | 1460 | rpc_exit(task, error); |
1461 | dprintk("RPC: %5u %s: call failed with error %d\n", task->tk_pid, | 1461 | dprintk("RPC: %5u %s: call failed with error %d\n", task->tk_pid, |
1462 | __FUNCTION__, error); | 1462 | __func__, error); |
1463 | return ERR_PTR(error); | 1463 | return ERR_PTR(error); |
1464 | out_overflow: | 1464 | out_overflow: |
1465 | dprintk("RPC: %5u %s: server reply was truncated.\n", task->tk_pid, | 1465 | dprintk("RPC: %5u %s: server reply was truncated.\n", task->tk_pid, |
1466 | __FUNCTION__); | 1466 | __func__); |
1467 | goto out_garbage; | 1467 | goto out_garbage; |
1468 | } | 1468 | } |
1469 | 1469 | ||
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 1b395a41a8b2..5a9b0e7828cd 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -479,13 +479,13 @@ rpc_lookup_parent(char *path, struct nameidata *nd) | |||
479 | mnt = rpc_get_mount(); | 479 | mnt = rpc_get_mount(); |
480 | if (IS_ERR(mnt)) { | 480 | if (IS_ERR(mnt)) { |
481 | printk(KERN_WARNING "%s: %s failed to mount " | 481 | printk(KERN_WARNING "%s: %s failed to mount " |
482 | "pseudofilesystem \n", __FILE__, __FUNCTION__); | 482 | "pseudofilesystem \n", __FILE__, __func__); |
483 | return PTR_ERR(mnt); | 483 | return PTR_ERR(mnt); |
484 | } | 484 | } |
485 | 485 | ||
486 | if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) { | 486 | if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) { |
487 | printk(KERN_WARNING "%s: %s failed to find path %s\n", | 487 | printk(KERN_WARNING "%s: %s failed to find path %s\n", |
488 | __FILE__, __FUNCTION__, path); | 488 | __FILE__, __func__, path); |
489 | rpc_put_mount(); | 489 | rpc_put_mount(); |
490 | return -ENOENT; | 490 | return -ENOENT; |
491 | } | 491 | } |
@@ -604,7 +604,7 @@ rpc_populate(struct dentry *parent, | |||
604 | out_bad: | 604 | out_bad: |
605 | mutex_unlock(&dir->i_mutex); | 605 | mutex_unlock(&dir->i_mutex); |
606 | printk(KERN_WARNING "%s: %s failed to populate directory %s\n", | 606 | printk(KERN_WARNING "%s: %s failed to populate directory %s\n", |
607 | __FILE__, __FUNCTION__, parent->d_name.name); | 607 | __FILE__, __func__, parent->d_name.name); |
608 | return -ENOMEM; | 608 | return -ENOMEM; |
609 | } | 609 | } |
610 | 610 | ||
@@ -623,7 +623,7 @@ __rpc_mkdir(struct inode *dir, struct dentry *dentry) | |||
623 | return 0; | 623 | return 0; |
624 | out_err: | 624 | out_err: |
625 | printk(KERN_WARNING "%s: %s failed to allocate inode for dentry %s\n", | 625 | printk(KERN_WARNING "%s: %s failed to allocate inode for dentry %s\n", |
626 | __FILE__, __FUNCTION__, dentry->d_name.name); | 626 | __FILE__, __func__, dentry->d_name.name); |
627 | return -ENOMEM; | 627 | return -ENOMEM; |
628 | } | 628 | } |
629 | 629 | ||
@@ -715,7 +715,7 @@ err_depopulate: | |||
715 | err_dput: | 715 | err_dput: |
716 | dput(dentry); | 716 | dput(dentry); |
717 | printk(KERN_WARNING "%s: %s() failed to create directory %s (errno = %d)\n", | 717 | printk(KERN_WARNING "%s: %s() failed to create directory %s (errno = %d)\n", |
718 | __FILE__, __FUNCTION__, path, error); | 718 | __FILE__, __func__, path, error); |
719 | dentry = ERR_PTR(error); | 719 | dentry = ERR_PTR(error); |
720 | goto out; | 720 | goto out; |
721 | } | 721 | } |
@@ -804,7 +804,7 @@ err_dput: | |||
804 | dput(dentry); | 804 | dput(dentry); |
805 | dentry = ERR_PTR(-ENOMEM); | 805 | dentry = ERR_PTR(-ENOMEM); |
806 | printk(KERN_WARNING "%s: %s() failed to create pipe %s/%s (errno = %d)\n", | 806 | printk(KERN_WARNING "%s: %s() failed to create pipe %s/%s (errno = %d)\n", |
807 | __FILE__, __FUNCTION__, parent->d_name.name, name, | 807 | __FILE__, __func__, parent->d_name.name, name, |
808 | -ENOMEM); | 808 | -ENOMEM); |
809 | goto out; | 809 | goto out; |
810 | } | 810 | } |
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index 3164a0871cf0..56aa018dce3a 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c | |||
@@ -224,7 +224,7 @@ int rpcb_getport_sync(struct sockaddr_in *sin, u32 prog, u32 vers, int prot) | |||
224 | int status; | 224 | int status; |
225 | 225 | ||
226 | dprintk("RPC: %s(" NIPQUAD_FMT ", %u, %u, %d)\n", | 226 | dprintk("RPC: %s(" NIPQUAD_FMT ", %u, %u, %d)\n", |
227 | __FUNCTION__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); | 227 | __func__, NIPQUAD(sin->sin_addr.s_addr), prog, vers, prot); |
228 | 228 | ||
229 | rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin, | 229 | rpcb_clnt = rpcb_create(NULL, (struct sockaddr *)sin, |
230 | sizeof(*sin), prot, 2, 0); | 230 | sizeof(*sin), prot, 2, 0); |
@@ -283,7 +283,7 @@ void rpcb_getport_async(struct rpc_task *task) | |||
283 | struct rpcb_info *info; | 283 | struct rpcb_info *info; |
284 | 284 | ||
285 | dprintk("RPC: %5u %s(%s, %u, %u, %d)\n", | 285 | dprintk("RPC: %5u %s(%s, %u, %u, %d)\n", |
286 | task->tk_pid, __FUNCTION__, | 286 | task->tk_pid, __func__, |
287 | clnt->cl_server, clnt->cl_prog, clnt->cl_vers, xprt->prot); | 287 | clnt->cl_server, clnt->cl_prog, clnt->cl_vers, xprt->prot); |
288 | 288 | ||
289 | /* Autobind on cloned rpc clients is discouraged */ | 289 | /* Autobind on cloned rpc clients is discouraged */ |
@@ -292,7 +292,7 @@ void rpcb_getport_async(struct rpc_task *task) | |||
292 | if (xprt_test_and_set_binding(xprt)) { | 292 | if (xprt_test_and_set_binding(xprt)) { |
293 | status = -EAGAIN; /* tell caller to check again */ | 293 | status = -EAGAIN; /* tell caller to check again */ |
294 | dprintk("RPC: %5u %s: waiting for another binder\n", | 294 | dprintk("RPC: %5u %s: waiting for another binder\n", |
295 | task->tk_pid, __FUNCTION__); | 295 | task->tk_pid, __func__); |
296 | goto bailout_nowake; | 296 | goto bailout_nowake; |
297 | } | 297 | } |
298 | 298 | ||
@@ -304,7 +304,7 @@ void rpcb_getport_async(struct rpc_task *task) | |||
304 | if (xprt_bound(xprt)) { | 304 | if (xprt_bound(xprt)) { |
305 | status = 0; | 305 | status = 0; |
306 | dprintk("RPC: %5u %s: already bound\n", | 306 | dprintk("RPC: %5u %s: already bound\n", |
307 | task->tk_pid, __FUNCTION__); | 307 | task->tk_pid, __func__); |
308 | goto bailout_nofree; | 308 | goto bailout_nofree; |
309 | } | 309 | } |
310 | 310 | ||
@@ -321,27 +321,27 @@ void rpcb_getport_async(struct rpc_task *task) | |||
321 | default: | 321 | default: |
322 | status = -EAFNOSUPPORT; | 322 | status = -EAFNOSUPPORT; |
323 | dprintk("RPC: %5u %s: bad address family\n", | 323 | dprintk("RPC: %5u %s: bad address family\n", |
324 | task->tk_pid, __FUNCTION__); | 324 | task->tk_pid, __func__); |
325 | goto bailout_nofree; | 325 | goto bailout_nofree; |
326 | } | 326 | } |
327 | if (info[xprt->bind_index].rpc_proc == NULL) { | 327 | if (info[xprt->bind_index].rpc_proc == NULL) { |
328 | xprt->bind_index = 0; | 328 | xprt->bind_index = 0; |
329 | status = -EPFNOSUPPORT; | 329 | status = -EPFNOSUPPORT; |
330 | dprintk("RPC: %5u %s: no more getport versions available\n", | 330 | dprintk("RPC: %5u %s: no more getport versions available\n", |
331 | task->tk_pid, __FUNCTION__); | 331 | task->tk_pid, __func__); |
332 | goto bailout_nofree; | 332 | goto bailout_nofree; |
333 | } | 333 | } |
334 | bind_version = info[xprt->bind_index].rpc_vers; | 334 | bind_version = info[xprt->bind_index].rpc_vers; |
335 | 335 | ||
336 | dprintk("RPC: %5u %s: trying rpcbind version %u\n", | 336 | dprintk("RPC: %5u %s: trying rpcbind version %u\n", |
337 | task->tk_pid, __FUNCTION__, bind_version); | 337 | task->tk_pid, __func__, bind_version); |
338 | 338 | ||
339 | rpcb_clnt = rpcb_create(clnt->cl_server, sap, salen, xprt->prot, | 339 | rpcb_clnt = rpcb_create(clnt->cl_server, sap, salen, xprt->prot, |
340 | bind_version, 0); | 340 | bind_version, 0); |
341 | if (IS_ERR(rpcb_clnt)) { | 341 | if (IS_ERR(rpcb_clnt)) { |
342 | status = PTR_ERR(rpcb_clnt); | 342 | status = PTR_ERR(rpcb_clnt); |
343 | dprintk("RPC: %5u %s: rpcb_create failed, error %ld\n", | 343 | dprintk("RPC: %5u %s: rpcb_create failed, error %ld\n", |
344 | task->tk_pid, __FUNCTION__, PTR_ERR(rpcb_clnt)); | 344 | task->tk_pid, __func__, PTR_ERR(rpcb_clnt)); |
345 | goto bailout_nofree; | 345 | goto bailout_nofree; |
346 | } | 346 | } |
347 | 347 | ||
@@ -349,7 +349,7 @@ void rpcb_getport_async(struct rpc_task *task) | |||
349 | if (!map) { | 349 | if (!map) { |
350 | status = -ENOMEM; | 350 | status = -ENOMEM; |
351 | dprintk("RPC: %5u %s: no memory available\n", | 351 | dprintk("RPC: %5u %s: no memory available\n", |
352 | task->tk_pid, __FUNCTION__); | 352 | task->tk_pid, __func__); |
353 | goto bailout_nofree; | 353 | goto bailout_nofree; |
354 | } | 354 | } |
355 | map->r_prog = clnt->cl_prog; | 355 | map->r_prog = clnt->cl_prog; |
@@ -366,7 +366,7 @@ void rpcb_getport_async(struct rpc_task *task) | |||
366 | if (IS_ERR(child)) { | 366 | if (IS_ERR(child)) { |
367 | status = -EIO; | 367 | status = -EIO; |
368 | dprintk("RPC: %5u %s: rpc_run_task failed\n", | 368 | dprintk("RPC: %5u %s: rpc_run_task failed\n", |
369 | task->tk_pid, __FUNCTION__); | 369 | task->tk_pid, __func__); |
370 | goto bailout; | 370 | goto bailout; |
371 | } | 371 | } |
372 | rpc_put_task(child); | 372 | rpc_put_task(child); |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 30e7ac243a90..613daf8c1ff7 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1359,7 +1359,7 @@ static int xs_bind4(struct sock_xprt *transport, struct socket *sock) | |||
1359 | nloop++; | 1359 | nloop++; |
1360 | } while (err == -EADDRINUSE && nloop != 2); | 1360 | } while (err == -EADDRINUSE && nloop != 2); |
1361 | dprintk("RPC: %s "NIPQUAD_FMT":%u: %s (%d)\n", | 1361 | dprintk("RPC: %s "NIPQUAD_FMT":%u: %s (%d)\n", |
1362 | __FUNCTION__, NIPQUAD(myaddr.sin_addr), | 1362 | __func__, NIPQUAD(myaddr.sin_addr), |
1363 | port, err ? "failed" : "ok", err); | 1363 | port, err ? "failed" : "ok", err); |
1364 | return err; | 1364 | return err; |
1365 | } | 1365 | } |