8 files changed, 5 insertions, 15 deletions

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 816333cd377b..145524039577 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -222,8 +222,7 @@ nlmclnt_proc(struct inode *inode, int cmd, struct file_lock *fl)
                         goto done;
                 }
                 clnt->cl_softrtry = nfssrv->client->cl_softrtry;
-                clnt->cl_intr     = nfssrv->client->cl_intr;
-                clnt->cl_chatty   = nfssrv->client->cl_chatty;
+                clnt->cl_intr = nfssrv->client->cl_intr;
         }
 
         /* Keep the old signal mask */
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 2d144abe84ad..0edc03e67966 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -123,7 +123,6 @@ nsm_create(void)
         if (IS_ERR(clnt))
                 goto out_err;
         clnt->cl_softrtry = 1;
-        clnt->cl_chatty   = 1;
         clnt->cl_oneshot  = 1;
         return clnt;
 
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 648cb1aef3b1..4625479a6b62 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -413,7 +413,6 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
 
         clnt->cl_intr     = 1;
         clnt->cl_softrtry = 1;
-        clnt->cl_chatty   = 1;
 
         return clnt;
 
@@ -1838,7 +1837,6 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
                 }
                 clnt->cl_intr     = 1;
                 clnt->cl_softrtry = 1;
-                clnt->cl_chatty   = 1;
                 clp->cl_rpcclient = clnt;
                 memcpy(clp->cl_ipaddr, server->ip_addr, sizeof(clp->cl_ipaddr));
                 nfs_idmap_new(clp);
diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c
index 0e82617f2de0..db99b8f678f8 100644
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@ -82,7 +82,6 @@ mnt_create(char *hostname, struct sockaddr_in *srvaddr, int version,
                                 RPC_AUTH_UNIX);
         if (!IS_ERR(clnt)) {
                 clnt->cl_softrtry = 1;
-                clnt->cl_chatty   = 1;
                 clnt->cl_oneshot  = 1;
                 clnt->cl_intr = 1;
         }
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index cf92008f219a..d828662d737d 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -431,7 +431,6 @@ nfsd4_probe_callback(struct nfs4_client *clp)
         }
         clnt->cl_intr = 0;
         clnt->cl_softrtry = 1;
-        clnt->cl_chatty = 1;
 
         /* Kick rpciod, put the call on the wire. */
 
diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index 3d605765f84b..f147e6b84332 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -49,7 +49,6 @@ struct rpc_clnt {
 
         unsigned int            cl_softrtry : 1,/* soft timeouts */
                                 cl_intr     : 1,/* interruptible */
-                                cl_chatty   : 1,/* be verbose */
                                 cl_autobind : 1,/* use getport() */
                                 cl_oneshot  : 1,/* dispose after use */
                                 cl_dead     : 1;/* abandoned */
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;