diff options
author | Chuck Lever <cel@netapp.com> | 2006-01-03 03:55:52 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-01-06 14:58:56 -0500 |
commit | f518e35aec984036903c1003e867f833747a9d79 (patch) | |
tree | 2697838e0b1e6cc80565204de8b46430ded1246a /net/sunrpc/clnt.c | |
parent | 922004120b10dcb0ce04b55014168e8a7a8c1a0e (diff) |
SUNRPC: get rid of cl_chatty
Clean up: Every ULP that uses the in-kernel RPC client, except the NLM
client, sets cl_chatty. There's no reason why NLM shouldn't set it, so
just get rid of cl_chatty and always be verbose.
Test-plan:
Compile with CONFIG_NFS enabled.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
-rw-r--r-- | net/sunrpc/clnt.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 2789d3083fe7..5530ac8c6df9 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -957,8 +957,7 @@ call_status(struct rpc_task *task) | |||
957 | rpc_exit(task, status); | 957 | rpc_exit(task, status); |
958 | break; | 958 | break; |
959 | default: | 959 | default: |
960 | if (clnt->cl_chatty) | 960 | printk("%s: RPC call returned error %d\n", |
961 | printk("%s: RPC call returned error %d\n", | ||
962 | clnt->cl_protname, -status); | 961 | clnt->cl_protname, -status); |
963 | rpc_exit(task, status); | 962 | rpc_exit(task, status); |
964 | break; | 963 | break; |
@@ -993,14 +992,13 @@ call_timeout(struct rpc_task *task) | |||
993 | 992 | ||
994 | dprintk("RPC: %4d call_timeout (major)\n", task->tk_pid); | 993 | dprintk("RPC: %4d call_timeout (major)\n", task->tk_pid); |
995 | if (RPC_IS_SOFT(task)) { | 994 | if (RPC_IS_SOFT(task)) { |
996 | if (clnt->cl_chatty) | 995 | printk(KERN_NOTICE "%s: server %s not responding, timed out\n", |
997 | printk(KERN_NOTICE "%s: server %s not responding, timed out\n", | ||
998 | clnt->cl_protname, clnt->cl_server); | 996 | clnt->cl_protname, clnt->cl_server); |
999 | rpc_exit(task, -EIO); | 997 | rpc_exit(task, -EIO); |
1000 | return; | 998 | return; |
1001 | } | 999 | } |
1002 | 1000 | ||
1003 | if (clnt->cl_chatty && !(task->tk_flags & RPC_CALL_MAJORSEEN)) { | 1001 | if (!(task->tk_flags & RPC_CALL_MAJORSEEN)) { |
1004 | task->tk_flags |= RPC_CALL_MAJORSEEN; | 1002 | task->tk_flags |= RPC_CALL_MAJORSEEN; |
1005 | printk(KERN_NOTICE "%s: server %s not responding, still trying\n", | 1003 | printk(KERN_NOTICE "%s: server %s not responding, still trying\n", |
1006 | clnt->cl_protname, clnt->cl_server); | 1004 | clnt->cl_protname, clnt->cl_server); |
@@ -1027,7 +1025,7 @@ call_decode(struct rpc_task *task) | |||
1027 | dprintk("RPC: %4d call_decode (status %d)\n", | 1025 | dprintk("RPC: %4d call_decode (status %d)\n", |
1028 | task->tk_pid, task->tk_status); | 1026 | task->tk_pid, task->tk_status); |
1029 | 1027 | ||
1030 | if (clnt->cl_chatty && (task->tk_flags & RPC_CALL_MAJORSEEN)) { | 1028 | if (task->tk_flags & RPC_CALL_MAJORSEEN) { |
1031 | printk(KERN_NOTICE "%s: server %s OK\n", | 1029 | printk(KERN_NOTICE "%s: server %s OK\n", |
1032 | clnt->cl_protname, clnt->cl_server); | 1030 | clnt->cl_protname, clnt->cl_server); |
1033 | task->tk_flags &= ~RPC_CALL_MAJORSEEN; | 1031 | task->tk_flags &= ~RPC_CALL_MAJORSEEN; |