aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/rpcb_clnt.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-05 23:47:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-03-05 23:47:47 -0500
commit0dc47877a3de00ceadea0005189656ae8dc52669 (patch)
tree7440a87385fe318cb42f0ae161be195f5e967d82 /net/sunrpc/rpcb_clnt.c
parent6387c4bed539539b05fa773cf2ff26529dc3074c (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/rpcb_clnt.c')
-rw-r--r--net/sunrpc/rpcb_clnt.c20
1 files changed, 10 insertions, 10 deletions
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);