diff options
| author |   NeilBrown <neilb@suse.de> | 2006-10-02 02:17:50 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 07:57:18 -0700 |
| commit | 6fb2b47fa16c81317ec282248e6cff521cca31c2 (patch) | |
| tree | 226d823e900aba03fb7ee55cab3a9137fd5d9077 /fs/lockd | |
| parent | [PATCH] nfsd: add lock annotations to e_start and e_stop (diff) | |
| download | linux-dev-6fb2b47fa16c81317ec282248e6cff521cca31c2.tar.xz linux-dev-6fb2b47fa16c81317ec282248e6cff521cca31c2.zip | |
[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 'fs/lockd')
| -rw-r--r-- | fs/lockd/svc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 8d19de6a14dc..f0791cff45ac 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -98,7 +98,6 @@ static inline void clear_grace_period(void) static void lockd(struct svc_rqst *rqstp) { - struct svc_serv *serv = rqstp->rq_server; int err = 0; unsigned long grace_period_expire; @@ -114,7 +113,7 @@ lockd(struct svc_rqst *rqstp) * Let our maker know we're running. */ nlmsvc_pid = current->pid; - nlmsvc_serv = serv; + nlmsvc_serv = rqstp->rq_server; complete(&lockd_start_done); daemonize("lockd"); @@ -164,7 +163,7 @@ lockd(struct svc_rqst *rqstp) * Find a socket with data available and call its * recvfrom routine. */ - err = svc_recv(serv, rqstp, timeout); + err = svc_recv(rqstp, timeout); if (err == -EAGAIN || err == -EINTR) continue; if (err < 0) { @@ -177,7 +176,7 @@ lockd(struct svc_rqst *rqstp) dprintk("lockd: request from %08x\n", (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr)); - svc_process(serv, rqstp); + svc_process(rqstp); } |