diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2018-06-13 15:04:59 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-06-17 10:43:02 -0400 |
| commit | 7a04cfda7dfa00173ab165577254ede83f81bf01 (patch) | |
| tree | 646bc531ff7fd6b5d6be1f87521d9cb63b53ea57 /fs | |
| parent | 4a269efb6f8199b58aa77a1a40404877974feb26 (diff) | |
| download | linux-7a04cfda7dfa00173ab165577254ede83f81bf01.tar.gz linux-7a04cfda7dfa00173ab165577254ede83f81bf01.tar.bz2 linux-7a04cfda7dfa00173ab165577254ede83f81bf01.zip | |
nfsd: clarify check_op_ordering
Document a couple things that confused me on a recent reading.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 1929f85b8269..140b05c8a4be 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1603,7 +1603,7 @@ static const char *nfsd4_op_name(unsigned opnum); */ static __be32 nfs41_check_op_ordering(struct nfsd4_compoundargs *args) { - struct nfsd4_op *op = &args->ops[0]; + struct nfsd4_op *first_op = &args->ops[0]; /* These ordering requirements don't apply to NFSv4.0: */ if (args->minorversion == 0) @@ -1611,12 +1611,17 @@ static __be32 nfs41_check_op_ordering(struct nfsd4_compoundargs *args) /* This is weird, but OK, not our problem: */ if (args->opcnt == 0) return nfs_ok; - if (op->status == nfserr_op_illegal) + if (first_op->status == nfserr_op_illegal) return nfs_ok; - if (!(nfsd4_ops[op->opnum].op_flags & ALLOWED_AS_FIRST_OP)) + if (!(nfsd4_ops[first_op->opnum].op_flags & ALLOWED_AS_FIRST_OP)) return nfserr_op_not_in_session; - if (op->opnum == OP_SEQUENCE) + if (first_op->opnum == OP_SEQUENCE) return nfs_ok; + /* + * So first_op is something allowed outside a session, like + * EXCHANGE_ID; but then it has to be the only op in the + * compound: + */ if (args->opcnt != 1) return nfserr_not_only_op; return nfs_ok; |