forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: Add support for NFS v4.2 operation checking

Browse source 
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>
This commit is contained in:
Anna Schumaker 2013-10-30 13:38:13 -04:00 • committed by J. Bruce Fields
commit 8217d146ab
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fs/nfsd/nfs4xdr.c
View file

@ -1585,11 +1585,13 @@ static nfsd4_dec nfsd4_dec_ops[] = {
static inline bool static inline bool
nfsd4_opnum_in_range(struct nfsd4_compoundargs *argp, struct nfsd4_op *op) 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; return false;
else if (argp->minorversion == 0 && op->opnum > OP_RELEASE_LOCKOWNER) else if (argp->minorversion == 0 && op->opnum > LAST_NFS40_OP)
return false; 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 false;
return true; return true;
} }

3
include/linux/nfs4.h
View file

@ -118,6 +118,9 @@ Needs to be updated if more operations are defined in future.*/
#define FIRST_NFS4_OP OP_ACCESS #define FIRST_NFS4_OP OP_ACCESS
#define LAST_NFS4_OP OP_RECLAIM_COMPLETE #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 { enum nfsstat4 {
NFS4_OK = 0, NFS4_OK = 0,