NFSD: Add support for NFS v4.2 operation checking

The server does allow NFS over v4.2, even if it doesn't add any new
operations yet.

I also switch to using constants to represent the last operation for
each minor version since this makes the code cleaner and easier to
understand at a quick glance.

Signed-off-by: Anna Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 99bebea20668ffb1bcdd78f77caf99ec7faa20e4..83db5a742aa9caf471c984fa616fc4645761d104 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1585,11 +1585,13 @@ static nfsd4_dec nfsd4_dec_ops[] = {
 static inline bool
 nfsd4_opnum_in_range(struct nfsd4_compoundargs *argp, struct nfsd4_op *op)
 {
-       if (op->opnum < FIRST_NFS4_OP || op->opnum > LAST_NFS4_OP)
+       if (op->opnum < FIRST_NFS4_OP)
                return false;
-       else if (argp->minorversion == 0 && op->opnum > OP_RELEASE_LOCKOWNER)
+       else if (argp->minorversion == 0 && op->opnum > LAST_NFS40_OP)
                return false;
-       else if (argp->minorversion == 1 && op->opnum > OP_RECLAIM_COMPLETE)
+       else if (argp->minorversion == 1 && op->opnum > LAST_NFS41_OP)
+               return false;
+       else if (argp->minorversion == 2 && op->opnum > LAST_NFS42_OP)
                return false;
        return true;
 }

diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index e36dee52f224f146805b58a48008012dc68602a8..737e40e4c554be60ed63ddc509e93c0a6750ef7d 100644 (file)
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -118,6 +118,9 @@ Needs to be updated if more operations are defined in future.*/
 
 #define FIRST_NFS4_OP  OP_ACCESS
 #define LAST_NFS4_OP   OP_RECLAIM_COMPLETE
+#define LAST_NFS40_OP  OP_RELEASE_LOCKOWNER
+#define LAST_NFS41_OP  OP_RECLAIM_COMPLETE
+#define LAST_NFS42_OP  OP_RECLAIM_COMPLETE
 
 enum nfsstat4 {
        NFS4_OK = 0,