[PATCH] sunrpc: clarify the source of some messages
From: Sean Neakums <hidden>
Date: 2005-01-15 16:27:12
Also in:
lkml
Sometimes cl_protname is "portmap", which can make it seem as if the userspace portmapper is complaining, when in fact it is sunrpc that is complaining. The second hunk also adds a missing printk level. Against 2.6.11-rc1. diff -urN --exclude '*~' S11-rc1/net/sunrpc/clnt.c S11-rc1~sunrpc/net/sunrpc/clnt.c
--- S11-rc1/net/sunrpc/clnt.c 2005-01-15 11:45:16.000000000 +0000
+++ S11-rc1~sunrpc/net/sunrpc/clnt.c 2005-01-15 16:15:10.000000000 +0000@@ -631,7 +631,7 @@ } if (encode && (status = rpcauth_wrap_req(task, encode, req, p, task->tk_msg.rpc_argp)) < 0) { - printk(KERN_WARNING "%s: can't encode arguments: %d\n", + printk(KERN_WARNING "RPC: %s: can't encode arguments: %d\n", clnt->cl_protname, -status); rpc_exit(task, status); }
@@ -781,7 +781,7 @@ break; default: if (clnt->cl_chatty) - printk("%s: RPC call returned error %d\n", + printk(KERN_NOTICE "RPC: %s: RPC call returned error %d\n", clnt->cl_protname, -status); rpc_exit(task, status); break;
@@ -806,7 +806,7 @@ dprintk("RPC: %4d call_timeout (major)\n", task->tk_pid); if (RPC_IS_SOFT(task)) { if (clnt->cl_chatty) - printk(KERN_NOTICE "%s: server %s not responding, timed out\n", + printk(KERN_NOTICE "RPC: %s: server %s not responding, timed out\n", clnt->cl_protname, clnt->cl_server); rpc_exit(task, -EIO); return;
@@ -814,7 +814,7 @@ if (clnt->cl_chatty && !(task->tk_flags & RPC_CALL_MAJORSEEN)) { task->tk_flags |= RPC_CALL_MAJORSEEN; - printk(KERN_NOTICE "%s: server %s not responding, still trying\n", + printk(KERN_NOTICE "RPC: %s: server %s not responding, still trying\n", clnt->cl_protname, clnt->cl_server); } if (clnt->cl_autobind)
@@ -841,7 +841,7 @@ task->tk_pid, task->tk_status); if (clnt->cl_chatty && (task->tk_flags & RPC_CALL_MAJORSEEN)) { - printk(KERN_NOTICE "%s: server %s OK\n", + printk(KERN_NOTICE "RPC: %s: server %s OK\n", clnt->cl_protname, clnt->cl_server); task->tk_flags &= ~RPC_CALL_MAJORSEEN; }
@@ -852,7 +852,7 @@ clnt->cl_stats->rpcretrans++; goto out_retry; } - printk(KERN_WARNING "%s: too small RPC reply size (%d bytes)\n", + printk(KERN_WARNING "RPC: %s: too small RPC reply size (%d bytes)\n", clnt->cl_protname, task->tk_status); rpc_exit(task, -EIO); return;