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 /fs/lockd | |
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 'fs/lockd')
-rw-r--r-- | fs/lockd/clntproc.c | 3 | ||||
-rw-r--r-- | fs/lockd/mon.c | 1 |
2 files changed, 1 insertions, 3 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) | |||
222 | goto done; | 222 | goto done; |
223 | } | 223 | } |
224 | clnt->cl_softrtry = nfssrv->client->cl_softrtry; | 224 | clnt->cl_softrtry = nfssrv->client->cl_softrtry; |
225 | clnt->cl_intr = nfssrv->client->cl_intr; | 225 | clnt->cl_intr = nfssrv->client->cl_intr; |
226 | clnt->cl_chatty = nfssrv->client->cl_chatty; | ||
227 | } | 226 | } |
228 | 227 | ||
229 | /* Keep the old signal mask */ | 228 | /* 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) | |||
123 | if (IS_ERR(clnt)) | 123 | if (IS_ERR(clnt)) |
124 | goto out_err; | 124 | goto out_err; |
125 | clnt->cl_softrtry = 1; | 125 | clnt->cl_softrtry = 1; |
126 | clnt->cl_chatty = 1; | ||
127 | clnt->cl_oneshot = 1; | 126 | clnt->cl_oneshot = 1; |
128 | return clnt; | 127 | return clnt; |
129 | 128 | ||