diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-07-24 21:38:18 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:31:56 -0400 |
commit | 3b398f0ef8db6a9bb431474afd871f4295203d2d (patch) | |
tree | 6ad8d3729f260ad1acde039ef81d7ddc03125097 /fs/nfsd | |
parent | 9c85fca56b569dfba1f10ae12ce425c0e678df83 (diff) |
knfsd: delete code made redundant by map_new_errors
I moved this check into map_new_errors, but forgot to delete the
original. Oops.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Acked-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfssvc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 221eeaa68a2d..ef46f3228330 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -546,8 +546,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) | |||
546 | /* Now call the procedure handler, and encode NFS status. */ | 546 | /* Now call the procedure handler, and encode NFS status. */ |
547 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); | 547 | nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp); |
548 | nfserr = map_new_errors(rqstp->rq_vers, nfserr); | 548 | nfserr = map_new_errors(rqstp->rq_vers, nfserr); |
549 | if (nfserr == nfserr_jukebox && rqstp->rq_vers == 2) | ||
550 | nfserr = nfserr_dropit; | ||
551 | if (nfserr == nfserr_dropit) { | 549 | if (nfserr == nfserr_dropit) { |
552 | dprintk("nfsd: Dropping request; may be revisited later\n"); | 550 | dprintk("nfsd: Dropping request; may be revisited later\n"); |
553 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); | 551 | nfsd_cache_update(rqstp, RC_NOCACHE, NULL); |