patch-2.4.0-test3 linux/fs/nfsd/nfssvc.c

• Lines: 26
• Date: Mon Jun 26 11:44:15 2000
• Orig file: v2.4.0-test2/linux/fs/nfsd/nfssvc.c
• Orig date: Mon Mar 27 08:08:30 2000

diff -u --recursive --new-file v2.4.0-test2/linux/fs/nfsd/nfssvc.c linux/fs/nfsd/nfssvc.c
@@ -275,7 +275,6 @@
 	/* Encode result.
 	 * For NFSv2, additional info is never returned in case of an error.
 	 */
-#ifdef CONFIG_NFSD_V3
 	if (!(nfserr && rqstp->rq_vers == 2)) {
 		xdr = proc->pc_encode;
 		if (xdr && !xdr(rqstp, rqstp->rq_resbuf.buf, rqstp->rq_resp)) {
@@ -286,17 +285,6 @@
 			return 1;
 		}
 	}
-#else
-	xdr = proc->pc_encode;
-	if (!nfserr && xdr
-	 && !xdr(rqstp, rqstp->rq_resbuf.buf, rqstp->rq_resp)) {
-		/* Failed to encode result. Release cache entry */
-		dprintk("nfsd: failed to encode result!\n");
-		nfsd_cache_update(rqstp, RC_NOCACHE, NULL);
-		*statp = rpc_system_err;
-		return 1;
-	}
-#endif /* CONFIG_NFSD_V3 */
 
 	/* Store reply in cache. */
 	nfsd_cache_update(rqstp, proc->pc_cachetype, statp + 1);