Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104104
b: refs/heads/master
c: 30cff1f
h: refs/heads/master
v: v3
  • Loading branch information
Benny Halevy authored and J. Bruce Fields committed Jul 2, 2008
1 parent e855b38 commit 2e41818
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07cad1d2a4b0112acd41381d5bc6be82fd71ebac
refs/heads/master: 30cff1ffff3981c8d96dc33870b652e70190ba37
10 changes: 3 additions & 7 deletions trunk/fs/nfsd/nfs4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 2e41818

Please sign in to comment.