From 2e41818af9af25142c5ea578b5209ff404d49112 Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Wed, 2 Jul 2008 11:13:18 +0300
Subject: [PATCH] --- yaml --- r: 104104 b: refs/heads/master c:
 30cff1ffff3981c8d96dc33870b652e70190ba37 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/fs/nfsd/nfs4xdr.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b5196e85b0e8..3037666039f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07cad1d2a4b0112acd41381d5bc6be82fd71ebac
+refs/heads/master: 30cff1ffff3981c8d96dc33870b652e70190ba37
diff --git a/trunk/fs/nfsd/nfs4xdr.c b/trunk/fs/nfsd/nfs4xdr.c
index 9547ab636274..413a15332177 100644
--- a/trunk/fs/nfsd/nfs4xdr.c
+++ b/trunk/fs/nfsd/nfs4xdr.c
@@ -1019,6 +1019,9 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
 		}
 	}
 
+	if (argp->minorversion != 0)
+		argp->opcnt = 0;
+
 	for (i = 0; i < argp->opcnt; i++) {
 		op = &argp->ops[i];
 		op->replay = NULL;
@@ -1057,13 +1060,6 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
 		op->opnum = ntohl(*argp->p++);
 
 		switch (op->opnum) {
-		case 2: /* Reserved operation */
-			op->opnum = OP_ILLEGAL;
-			if (argp->minorversion == 0)
-				op->status = nfserr_op_illegal;
-			else
-				op->status = nfserr_minor_vers_mismatch;
-			break;
 		case OP_ACCESS:
 			op->status = nfsd4_decode_access(argp, &op->u.access);
 			break;