public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nfsd: clarify check_op_ordering

Browse source 
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>
This commit is contained in:
J. Bruce Fields 2018-06-13 15:04:59 -04:00
parent 4a269efb6f
commit 7a04cfda7d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/nfsd/nfs4proc.c
View file

@ -1603,7 +1603,7 @@ static const char *nfsd4_op_name(unsigned opnum);
*/ */
static __be32 nfs41_check_op_ordering(struct nfsd4_compoundargs *args) 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: */ /* These ordering requirements don't apply to NFSv4.0: */
if (args->minorversion == 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: */ /* This is weird, but OK, not our problem: */
if (args->opcnt == 0) if (args->opcnt == 0)
return nfs_ok; return nfs_ok;
if (op->status == nfserr_op_illegal) if (first_op->status == nfserr_op_illegal)
return nfs_ok; 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; return nfserr_op_not_in_session;
if (op->opnum == OP_SEQUENCE) if (first_op->opnum == OP_SEQUENCE)
return nfs_ok; 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) if (args->opcnt != 1)
return nfserr_not_only_op; return nfserr_not_only_op;
return nfs_ok; return nfs_ok;