]> err.no Git - linux-2.6/commitdiff
knfsd: delete code made redundant by map_new_errors
authorJ. Bruce Fields <bfields@citi.umich.edu>
Wed, 25 Jul 2007 01:38:18 +0000 (21:38 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 9 Oct 2007 22:31:56 +0000 (18:31 -0400)
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>
fs/nfsd/nfssvc.c

index 221eeaa68a2d4e196741ef1d45ace8c195656f0c..ef46f3228330f973f56e3874bcea9a7937084566 100644 (file)
@@ -546,8 +546,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)
        /* Now call the procedure handler, and encode NFS status. */
        nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);
        nfserr = map_new_errors(rqstp->rq_vers, nfserr);
-       if (nfserr == nfserr_jukebox && rqstp->rq_vers == 2)
-               nfserr = nfserr_dropit;
        if (nfserr == nfserr_dropit) {
                dprintk("nfsd: Dropping request; may be revisited later\n");
                nfsd_cache_update(rqstp, RC_NOCACHE, NULL);