diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-08-17 21:47:53 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-08-21 17:42:00 -0400 |
commit | 5b444cc9a4c979aa0fa185c8ddca221462a34b7a (patch) | |
tree | 7a2b23292f279c31bacdabd95a709605e194137a /fs/nfsd | |
parent | 9f9d2ebe693a98d517257e1a39f61120b4473b96 (diff) |
svcrpc: remove handling of unknown errors from svc_recv
svc_recv() returns only -EINTR or -EAGAIN. If we really want to worry
about the case where it has a bug that causes it to return something
else, we could stick a WARN() in svc_recv. But it's silly to require
every caller to have all this boilerplate to handle that case.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfssvc.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index dd2b7343d741..2013aa001dab 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -487,7 +487,7 @@ static int | |||
487 | nfsd(void *vrqstp) | 487 | nfsd(void *vrqstp) |
488 | { | 488 | { |
489 | struct svc_rqst *rqstp = (struct svc_rqst *) vrqstp; | 489 | struct svc_rqst *rqstp = (struct svc_rqst *) vrqstp; |
490 | int err, preverr = 0; | 490 | int err; |
491 | 491 | ||
492 | /* Lock module and set up kernel thread */ | 492 | /* Lock module and set up kernel thread */ |
493 | mutex_lock(&nfsd_mutex); | 493 | mutex_lock(&nfsd_mutex); |
@@ -534,16 +534,6 @@ nfsd(void *vrqstp) | |||
534 | ; | 534 | ; |
535 | if (err == -EINTR) | 535 | if (err == -EINTR) |
536 | break; | 536 | break; |
537 | else if (err < 0) { | ||
538 | if (err != preverr) { | ||
539 | printk(KERN_WARNING "%s: unexpected error " | ||
540 | "from svc_recv (%d)\n", __func__, -err); | ||
541 | preverr = err; | ||
542 | } | ||
543 | schedule_timeout_uninterruptible(HZ); | ||
544 | continue; | ||
545 | } | ||
546 | |||
547 | validate_process_creds(); | 537 | validate_process_creds(); |
548 | svc_process(rqstp); | 538 | svc_process(rqstp); |
549 | validate_process_creds(); | 539 | validate_process_creds(); |