diff options
| author | NeilBrown <neilb@suse.de> | 2006-10-02 13:17:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 18:57:18 +0400 |
| commit | 6fb2b47fa16c81317ec282248e6cff521cca31c2 (patch) | |
| tree | 226d823e900aba03fb7ee55cab3a9137fd5d9077 /net | |
| parent | 896440d560de3bca6813e83792f431edf5073318 (diff) | |
| download | linux-6fb2b47fa16c81317ec282248e6cff521cca31c2.tar.xz | |
[PATCH] knfsd: Drop 'serv' option to svc_recv and svc_process
It isn't needed as it is available in rqstp->rq_server, and dropping it allows
some local vars to be dropped.
[akpm@osdl.org: build fix]
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/svc.c | 3 | ||||
| -rw-r--r-- | net/sunrpc/svcsock.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index f5aee4c61676..eee45a58f3ee 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -253,13 +253,14 @@ svc_register(struct svc_serv *serv, int proto, unsigned short port) * Process the RPC request. */ int -svc_process(struct svc_serv *serv, struct svc_rqst *rqstp) +svc_process(struct svc_rqst *rqstp) { struct svc_program *progp; struct svc_version *versp = NULL; /* compiler food */ struct svc_procedure *procp = NULL; struct kvec * argv = &rqstp->rq_arg.head[0]; struct kvec * resv = &rqstp->rq_res.head[0]; + struct svc_serv *serv = rqstp->rq_server; kxdrproc_t xdr; __be32 *statp; u32 dir, prog, vers, proc; diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index c6be67a86ae7..bc9bd189a540 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -1166,9 +1166,10 @@ svc_sock_update_bufs(struct svc_serv *serv) * Receive the next request on any socket. */ int -svc_recv(struct svc_serv *serv, struct svc_rqst *rqstp, long timeout) +svc_recv(struct svc_rqst *rqstp, long timeout) { struct svc_sock *svsk =NULL; + struct svc_serv *serv = rqstp->rq_server; int len; int pages; struct xdr_buf *arg; |