nfsd41: modify the members value of nfsd4_op_flags
authorMi Jinlong <mijinlong@cn.fujitsu.com>
Fri, 18 Feb 2011 01:08:31 +0000 (09:08 +0800)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 7 Mar 2011 17:10:33 +0000 (12:10 -0500)
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>
fs/nfsd/nfs4proc.c

index db52546143d1290ba8f1510a94b8db0054b45200..5fcb1396a7e324ada8f3cf639f2e6c025ca9a689 100644 (file)
@@ -984,8 +984,8 @@ typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
                              void *);
 enum nfsd4_op_flags {
        ALLOWED_WITHOUT_FH = 1 << 0,    /* No current filehandle required */
-       ALLOWED_ON_ABSENT_FS = 2 << 0,  /* ops processed on absent fs */
-       ALLOWED_AS_FIRST_OP = 3 << 0,   /* ops reqired first in compound */
+       ALLOWED_ON_ABSENT_FS = 1 << 1,  /* ops processed on absent fs */
+       ALLOWED_AS_FIRST_OP = 1 << 2,   /* ops reqired first in compound */
 };
 
 struct nfsd4_operation {