aboutsummaryrefslogtreecommitdiffstats
path: root/fs/lockd/svc.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-10-02 05:17:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-02 10:57:18 -0400
commit6fb2b47fa16c81317ec282248e6cff521cca31c2 (patch)
tree226d823e900aba03fb7ee55cab3a9137fd5d9077 /fs/lockd/svc.c
parent896440d560de3bca6813e83792f431edf5073318 (diff)
[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/svc.c')
-rw-r--r--fs/lockd/svc.c7
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)
98static void 98static void
99lockd(struct svc_rqst *rqstp) 99lockd(struct svc_rqst *rqstp)
100{ 100{
101 struct svc_serv *serv = rqstp->rq_server;
102 int err = 0; 101 int err = 0;
103 unsigned long grace_period_expire; 102 unsigned long grace_period_expire;
104 103
@@ -114,7 +113,7 @@ lockd(struct svc_rqst *rqstp)
114 * Let our maker know we're running. 113 * Let our maker know we're running.
115 */ 114 */
116 nlmsvc_pid = current->pid; 115 nlmsvc_pid = current->pid;
117 nlmsvc_serv = serv; 116 nlmsvc_serv = rqstp->rq_server;
118 complete(&lockd_start_done); 117 complete(&lockd_start_done);
119 118
120 daemonize("lockd"); 119 daemonize("lockd");
@@ -164,7 +163,7 @@ lockd(struct svc_rqst *rqstp)
164 * Find a socket with data available and call its 163 * Find a socket with data available and call its
165 * recvfrom routine. 164 * recvfrom routine.
166 */ 165 */
167 err = svc_recv(serv, rqstp, timeout); 166 err = svc_recv(rqstp, timeout);
168 if (err == -EAGAIN || err == -EINTR) 167 if (err == -EAGAIN || err == -EINTR)
169 continue; 168 continue;
170 if (err < 0) { 169 if (err < 0) {
@@ -177,7 +176,7 @@ lockd(struct svc_rqst *rqstp)
177 dprintk("lockd: request from %08x\n", 176 dprintk("lockd: request from %08x\n",
178 (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr)); 177 (unsigned)ntohl(rqstp->rq_addr.sin_addr.s_addr));
179 178
180 svc_process(serv, rqstp); 179 svc_process(rqstp);
181 180
182 } 181 }
183 182