Commit 5ece3caf authored Feb 18, 2011 by Mi Jinlong Committed by J. Bruce Fields Mar 07, 2011

nfsd41: modify the members value of nfsd4_op_flags



The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.

OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
can't appears as the first operation with out SEQUENCE ops.

This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which
was introduced by f9bb94c4.

Cc: stable@kernel.org
Reviewed-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent b0b0c0a2

fs/nfsd/nfs4proc.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -984,8 +984,8 @@ typedef __be32(nfsd4op_func)(struct svc_rqst , struct nfsd4_compound_state *,
	void *);		void *);
	enum nfsd4_op_flags {		enum nfsd4_op_flags {
	ALLOWED_WITHOUT_FH = 1 << 0, /* No current filehandle required */		ALLOWED_WITHOUT_FH = 1 << 0, /* No current filehandle required */
	ALLOWED_ON_ABSENT_FS = 2 << 0, /* ops processed on absent fs */		ALLOWED_ON_ABSENT_FS = 1 << 1, /* ops processed on absent fs */
	ALLOWED_AS_FIRST_OP = 3 << 0, /* ops reqired first in compound */		ALLOWED_AS_FIRST_OP = 1 << 2, /* ops reqired first in compound */
	};		};

	struct nfsd4_operation {		struct nfsd4_operation {