lkml.org 
[lkml]   [2011]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[22/35] nfsd41: modify the members value of nfsd4_op_flags
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mi Jinlong <mijinlong@cn.fujitsu.com>

    commit 5ece3cafbd88d4da5c734e1810c4a2e6474b57b2 upstream.

    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.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfsd/nfs4proc.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/nfsd/nfs4proc.c
    +++ b/fs/nfsd/nfs4proc.c
    @@ -953,8 +953,8 @@ typedef __be32(*nfsd4op_func)(struct svc
    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 {



    \
     
     \ /
      Last update: 2011-03-26 01:09    [W:3.593 / U:0.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site