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>

2 files changed, 4 insertions, 7 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)
                 rpc_exit(task, status);
                 break;
         default:
-                if (clnt->cl_chatty)
-                        printk("%s: RPC call returned error %d\n",
+                printk("%s: RPC call returned error %d\n",
                                clnt->cl_protname, -status);
                 rpc_exit(task, status);
                 break;
@@ -993,14 +992,13 @@ call_timeout(struct rpc_task *task)
 
         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 "%s: server %s not responding, timed out\n",
                                 clnt->cl_protname, clnt->cl_server);
                 rpc_exit(task, -EIO);
                 return;
         }
 
-        if (clnt->cl_chatty && !(task->tk_flags & RPC_CALL_MAJORSEEN)) {
+        if (!(task->tk_flags & RPC_CALL_MAJORSEEN)) {
                 task->tk_flags |= RPC_CALL_MAJORSEEN;
                 printk(KERN_NOTICE "%s: server %s not responding, still trying\n",
                         clnt->cl_protname, clnt->cl_server);
@@ -1027,7 +1025,7 @@ call_decode(struct rpc_task *task)
         dprintk("RPC: %4d call_decode (status %d)\n", 
                                 task->tk_pid, task->tk_status);
 
-        if (clnt->cl_chatty && (task->tk_flags & RPC_CALL_MAJORSEEN)) {
+        if (task->tk_flags & RPC_CALL_MAJORSEEN) {
                 printk(KERN_NOTICE "%s: server %s OK\n",
                         clnt->cl_protname, clnt->cl_server);
                 task->tk_flags &= ~RPC_CALL_MAJORSEEN;
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index 0935adb91b3c..8139ce68e915 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -217,7 +217,6 @@ pmap_create(char *hostname, struct sockaddr_in *srvaddr, int proto, int privileg
                                 RPC_AUTH_UNIX);
         if (!IS_ERR(clnt)) {
                 clnt->cl_softrtry = 1;
-                clnt->cl_chatty   = 1;
                 clnt->cl_oneshot  = 1;
         }
         return clnt;