Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b398f0e authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Acked-by: default avatarNeil Brown <neilb@suse.de>
parent 9c85fca5

fs/nfsd/nfssvc.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -546,8 +546,6 @@ nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp) 
	/* Now call the procedure handler, and encode NFS status. */

	/* Now call the procedure handler, and encode NFS status. */

	nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);

	nfserr = proc->pc_func(rqstp, rqstp->rq_argp, rqstp->rq_resp);

	nfserr = map_new_errors(rqstp->rq_vers, nfserr);

	nfserr = map_new_errors(rqstp->rq_vers, nfserr);

	if (nfserr == nfserr_jukebox && rqstp->rq_vers == 2)

		nfserr = nfserr_dropit;

	if (nfserr == nfserr_dropit) {

	if (nfserr == nfserr_dropit) {

		dprintk("nfsd: Dropping request; may be revisited later\n");

		dprintk("nfsd: Dropping request; may be revisited later\n");

		nfsd_cache_update(rqstp, RC_NOCACHE, NULL);

		nfsd_cache_update(rqstp, RC_NOCACHE, NULL);