Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f518e35a authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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: default avatarChuck Lever <cel@netapp.com>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 92200412

fs/lockd/clntproc.c

+1 −2
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ nlmclnt_proc(struct inode *inode, int cmd, struct file_lock *fl) 
		}

		clnt->cl_softrtry = nfssrv->client->cl_softrtry;

		clnt->cl_intr = nfssrv->client->cl_intr;

		clnt->cl_chatty   = nfssrv->client->cl_chatty;

	}



	/* Keep the old signal mask */

fs/lockd/mon.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

fs/nfs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/nfs/mount_clnt.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}

fs/nfsd/nfs4callback.c

+0 −1
Original line number Diff line number Diff line
@@ -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. */