aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfssvc.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/nfsd/nfssvc.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/nfsd/nfssvc.c')
-rw-r--r--fs/nfsd/nfssvc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 784f94fbebf..f1314c63e82 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -323,7 +323,6 @@ update_thread_usage(int busy_threads)
323static void 323static void
324nfsd(struct svc_rqst *rqstp) 324nfsd(struct svc_rqst *rqstp)
325{ 325{
326 struct svc_serv *serv = rqstp->rq_server;
327 struct fs_struct *fsp; 326 struct fs_struct *fsp;
328 int err; 327 int err;
329 struct nfsd_list me; 328 struct nfsd_list me;
@@ -373,8 +372,7 @@ nfsd(struct svc_rqst *rqstp)
373 * Find a socket with data available and call its 372 * Find a socket with data available and call its
374 * recvfrom routine. 373 * recvfrom routine.
375 */ 374 */
376 while ((err = svc_recv(serv, rqstp, 375 while ((err = svc_recv(rqstp, 60*60*HZ)) == -EAGAIN)
377 60*60*HZ)) == -EAGAIN)
378 ; 376 ;
379 if (err < 0) 377 if (err < 0)
380 break; 378 break;
@@ -387,7 +385,7 @@ nfsd(struct svc_rqst *rqstp)
387 /* Process request with signals blocked. */ 385 /* Process request with signals blocked. */
388 sigprocmask(SIG_SETMASK, &allowed_mask, NULL); 386 sigprocmask(SIG_SETMASK, &allowed_mask, NULL);
389 387
390 svc_process(serv, rqstp); 388 svc_process(rqstp);
391 389
392 /* Unlock export hash tables */ 390 /* Unlock export hash tables */
393 exp_readunlock(); 391 exp_readunlock();