diff options
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfssvc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 784f94fbebf3..f1314c63e823 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -323,7 +323,6 @@ update_thread_usage(int busy_threads) | |||
323 | static void | 323 | static void |
324 | nfsd(struct svc_rqst *rqstp) | 324 | nfsd(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(); |